Skip to content

Commit 6a20007

Browse files
treedaviesgregkh
authored andcommitted
Staging: rtl8192e: Rename variable skb_waitQ
Rename variable skb_waitQ to skb_waitq to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0edd0fb commit 6a20007

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

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);

drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1728,7 +1728,7 @@ void rtl92e_stop_adapter(struct net_device *dev, bool reset)
17281728
}
17291729

17301730
for (i = 0; i < MAX_QUEUE_SIZE; i++)
1731-
skb_queue_purge(&priv->rtllib->skb_waitQ[i]);
1731+
skb_queue_purge(&priv->rtllib->skb_waitq[i]);
17321732

17331733
skb_queue_purge(&priv->skb_queue);
17341734
}

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
723723
skb_queue_head_init(&priv->skb_queue);
724724

725725
for (i = 0; i < MAX_QUEUE_SIZE; i++)
726-
skb_queue_head_init(&priv->rtllib->skb_waitQ[i]);
726+
skb_queue_head_init(&priv->rtllib->skb_waitq[i]);
727727
}
728728

729729
static void _rtl92e_init_priv_lock(struct r8192_priv *priv)
@@ -1574,9 +1574,9 @@ static void _rtl92e_tx_resume(struct net_device *dev)
15741574

15751575
for (queue_index = BK_QUEUE;
15761576
queue_index < MAX_QUEUE_SIZE; queue_index++) {
1577-
while ((!skb_queue_empty(&ieee->skb_waitQ[queue_index])) &&
1577+
while ((!skb_queue_empty(&ieee->skb_waitq[queue_index])) &&
15781578
(priv->rtllib->check_nic_enough_desc(dev, queue_index) > 0)) {
1579-
skb = skb_dequeue(&ieee->skb_waitQ[queue_index]);
1579+
skb = skb_dequeue(&ieee->skb_waitq[queue_index]);
15801580
ieee->softmac_data_hard_start_xmit(skb, dev, 0);
15811581
}
15821582
}

drivers/staging/rtl8192e/rtllib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ struct rtllib_device {
13821382
int mgmt_queue_head;
13831383
int mgmt_queue_tail;
13841384
u8 AsocRetryCount;
1385-
struct sk_buff_head skb_waitQ[MAX_QUEUE_SIZE];
1385+
struct sk_buff_head skb_waitq[MAX_QUEUE_SIZE];
13861386

13871387
bool bdynamic_txpower_enable;
13881388

drivers/staging/rtl8192e/rtllib_softmac.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)
236236
/* check whether the managed packet queued greater than 5 */
237237
if (!ieee->check_nic_enough_desc(ieee->dev,
238238
tcb_desc->queue_index) ||
239-
skb_queue_len(&ieee->skb_waitQ[tcb_desc->queue_index]) ||
239+
skb_queue_len(&ieee->skb_waitq[tcb_desc->queue_index]) ||
240240
ieee->queue_stop) {
241241
/* insert the skb packet to the management queue
242242
*
@@ -246,7 +246,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)
246246
netdev_info(ieee->dev,
247247
"%s():insert to waitqueue, queue_index:%d!\n",
248248
__func__, tcb_desc->queue_index);
249-
skb_queue_tail(&ieee->skb_waitQ[tcb_desc->queue_index],
249+
skb_queue_tail(&ieee->skb_waitq[tcb_desc->queue_index],
250250
skb);
251251
} else {
252252
ieee->softmac_hard_start_xmit(skb, ieee->dev);
@@ -1823,7 +1823,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee)
18231823
* the wait queue
18241824
*/
18251825
for (i = 0; i < txb->nr_frags; i++) {
1826-
queue_len = skb_queue_len(&ieee->skb_waitQ[queue_index]);
1826+
queue_len = skb_queue_len(&ieee->skb_waitq[queue_index]);
18271827
if ((queue_len != 0) ||
18281828
(!ieee->check_nic_enough_desc(ieee->dev, queue_index)) ||
18291829
(ieee->queue_stop)) {
@@ -1832,7 +1832,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee)
18321832
* to check it any more.
18331833
*/
18341834
if (queue_len < 200)
1835-
skb_queue_tail(&ieee->skb_waitQ[queue_index],
1835+
skb_queue_tail(&ieee->skb_waitq[queue_index],
18361836
txb->fragments[i]);
18371837
else
18381838
kfree_skb(txb->fragments[i]);

0 commit comments

Comments
 (0)