Skip to content

Commit e38f734

Browse files
committed
Merge tag 'staging-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH: "Here is the "big" set of staging driver changes for 6.8-rc1. It's not really that big this release cycle, not much happened except for 186 patches of coding style cleanups. The majority was in the rtl8192e driver, but there are other smaller changes in a few other staging drivers, full details in the shortlog. All of these have been in linux-next for a while with no reported issues" * tag 'staging-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (186 commits) Staging: rtl8192e: Rename variable OpMode Staging: rtl8192e: Rename variable bIsAggregateFrame Staging: rtl8192e: Rename function rtllib_EnableNetMonitorMode() Staging: rtl8192e: Rename variable NumRxOkInPeriod Staging: rtl8192e: Rename variable NumTxOkInPeriod Staging: rtl8192e: Rename variable bUsed staging: vme_user: print more detailed infomation when an error occurs Staging: rtl8192e: Rename function rtllib_DisableNetMonitorMode() Staging: rtl8192e: Rename variable bInitState Staging: rtl8192e: Rename variable skb_waitQ Staging: rtl8192e: Rename variable BasicRate Staging: rtl8192e: Rename variable QueryRate Staging: rtl8192e: Rename function rtllib_TURBO_Info() Staging: rtl8192e: Rename function rtllib_WMM_Info() Staging: rtl8192e: Rename function rtllib_MFIE_Grate() Staging: rtl8192e: Rename function rtllib_MFIE_Brate() Staging: rtl8192e: Fixup statement broken across 2 lines in rtllib_softmac_new_net() Staging: rtl8192e: Fixup statement broken across 2 lines in rtllib_softmac_xmit() Staging: rtl8192e: Fix function definition broken across multiple lines Staging: rtl8192e: Fix statement broken across 2 lines in rtllib_rx_assoc_resp() ...
2 parents 80955ae + 0a46c21 commit e38f734

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1264
-2423
lines changed

CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3950,6 +3950,10 @@ S: 21513 Conradia Ct
39503950
S: Cupertino, CA 95014
39513951
S: USA
39523952

3953+
N: Manohar Vanga
3954+
E: manohar.vanga@gmail.com
3955+
D: VME subsystem maintainer
3956+
39533957
N: Thibaut Varène
39543958
E: hacks+kernel@slashdirt.org
39553959
W: http://hacks.slashdirt.org/
@@ -4050,6 +4054,10 @@ D: Fixes for the NE/2-driver
40504054
D: Miscellaneous MCA-support
40514055
D: Cleanup of the Config-files
40524056

4057+
N: Martyn Welch
4058+
E: martyn@welchs.me.uk
4059+
D: VME subsystem maintainer
4060+
40534061
N: Matt Welsh
40544062
E: mdw@metalab.unc.edu
40554063
W: http://www.cs.berkeley.edu/~mdw

MAINTAINERS

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23407,11 +23407,8 @@ F: include/linux/vmalloc.h
2340723407
F: mm/vmalloc.c
2340823408

2340923409
VME SUBSYSTEM
23410-
M: Martyn Welch <martyn@welchs.me.uk>
23411-
M: Manohar Vanga <manohar.vanga@gmail.com>
23412-
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2341323410
L: linux-kernel@vger.kernel.org
23414-
S: Odd fixes
23411+
S: Orphan
2341523412
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
2341623413
F: Documentation/driver-api/vme.rst
2341723414
F: drivers/staging/vme_user/

drivers/staging/rtl8192e/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0
22
rtllib-objs := \
3-
dot11d.o \
43
rtllib_module.o \
54
rtllib_rx.o \
65
rtllib_tx.o \

drivers/staging/rtl8192e/dot11d.c

Lines changed: 0 additions & 165 deletions
This file was deleted.

drivers/staging/rtl8192e/dot11d.h

Lines changed: 0 additions & 84 deletions
This file was deleted.

drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ bool rtl92e_send_cmd_pkt(struct net_device *dev, u32 type, const void *data,
6363

6464
if (type == DESC_PACKET_TYPE_INIT &&
6565
(!priv->rtllib->check_nic_enough_desc(dev, TXCMD_QUEUE) ||
66-
(!skb_queue_empty(&priv->rtllib->skb_waitQ[TXCMD_QUEUE])) ||
66+
(!skb_queue_empty(&priv->rtllib->skb_waitq[TXCMD_QUEUE])) ||
6767
(priv->rtllib->queue_stop))) {
68-
skb_queue_tail(&priv->rtllib->skb_waitQ[TXCMD_QUEUE],
68+
skb_queue_tail(&priv->rtllib->skb_waitq[TXCMD_QUEUE],
6969
skb);
7070
} else {
7171
priv->rtllib->softmac_hard_start_xmit(skb, dev);

0 commit comments

Comments
 (0)