Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-07 22:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Staging: rtl8192e: Rename variable skb_waitQ

Browse Source 
Rename variable skb_waitQ to skb_waitq to fix checkpatch
warning Avoid CamelCase.

Signed-off-by: Tree Davies <tdavies@darkphysics.net>
Link: https://lore.kernel.org/r/20231223015942.418263-19-tdavies@darkphysics.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tree Davies 2023-12-22 17:59:40 -08:00 committed by Greg Kroah-Hartman
parent 0edd0fb79e
commit 6a20007654
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c
View File

@ -63,9 +63,9 @@ bool rtl92e_send_cmd_pkt(struct net_device *dev, u32 type, const void *data,
if (type == DESC_PACKET_TYPE_INIT && if (type == DESC_PACKET_TYPE_INIT &&
(!priv->rtllib->check_nic_enough_desc(dev, TXCMD_QUEUE) || (!priv->rtllib->check_nic_enough_desc(dev, TXCMD_QUEUE) ||
(!skb_queue_empty(&priv->rtllib->skb_waitQ[TXCMD_QUEUE])) || (!skb_queue_empty(&priv->rtllib->skb_waitq[TXCMD_QUEUE])) ||
(priv->rtllib->queue_stop))) { (priv->rtllib->queue_stop))) {
skb_queue_tail(&priv->rtllib->skb_waitQ[TXCMD_QUEUE], skb_queue_tail(&priv->rtllib->skb_waitq[TXCMD_QUEUE],
skb); skb);
} else { } else {
priv->rtllib->softmac_hard_start_xmit(skb, dev); priv->rtllib->softmac_hard_start_xmit(skb, dev);

2
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
View File

@ -1728,7 +1728,7 @@ void rtl92e_stop_adapter(struct net_device *dev, bool reset)
} }
for (i = 0; i < MAX_QUEUE_SIZE; i++) for (i = 0; i < MAX_QUEUE_SIZE; i++)
skb_queue_purge(&priv->rtllib->skb_waitQ[i]); skb_queue_purge(&priv->rtllib->skb_waitq[i]);
skb_queue_purge(&priv->skb_queue); skb_queue_purge(&priv->skb_queue);
} }

6
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
View File

@ -723,7 +723,7 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
skb_queue_head_init(&priv->skb_queue); skb_queue_head_init(&priv->skb_queue);
for (i = 0; i < MAX_QUEUE_SIZE; i++) for (i = 0; i < MAX_QUEUE_SIZE; i++)
skb_queue_head_init(&priv->rtllib->skb_waitQ[i]); skb_queue_head_init(&priv->rtllib->skb_waitq[i]);
} }
static void _rtl92e_init_priv_lock(struct r8192_priv *priv) static void _rtl92e_init_priv_lock(struct r8192_priv *priv)
@ -1574,9 +1574,9 @@ static void _rtl92e_tx_resume(struct net_device *dev)
for (queue_index = BK_QUEUE; for (queue_index = BK_QUEUE;
queue_index < MAX_QUEUE_SIZE; queue_index++) { queue_index < MAX_QUEUE_SIZE; queue_index++) {
while ((!skb_queue_empty(&ieee->skb_waitQ[queue_index])) && while ((!skb_queue_empty(&ieee->skb_waitq[queue_index])) &&
(priv->rtllib->check_nic_enough_desc(dev, queue_index) > 0)) { (priv->rtllib->check_nic_enough_desc(dev, queue_index) > 0)) {
skb = skb_dequeue(&ieee->skb_waitQ[queue_index]); skb = skb_dequeue(&ieee->skb_waitq[queue_index]);
ieee->softmac_data_hard_start_xmit(skb, dev, 0); ieee->softmac_data_hard_start_xmit(skb, dev, 0);
} }
} }

2
drivers/staging/rtl8192e/rtllib.h
View File

@ -1382,7 +1382,7 @@ struct rtllib_device {
int mgmt_queue_head; int mgmt_queue_head;
int mgmt_queue_tail; int mgmt_queue_tail;
u8 AsocRetryCount; u8 AsocRetryCount;
struct sk_buff_head skb_waitQ[MAX_QUEUE_SIZE]; struct sk_buff_head skb_waitq[MAX_QUEUE_SIZE];
bool bdynamic_txpower_enable; bool bdynamic_txpower_enable;

8
drivers/staging/rtl8192e/rtllib_softmac.c
View File

@ -236,7 +236,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)
/* check whether the managed packet queued greater than 5 */ /* check whether the managed packet queued greater than 5 */
if (!ieee->check_nic_enough_desc(ieee->dev, if (!ieee->check_nic_enough_desc(ieee->dev,
tcb_desc->queue_index) || tcb_desc->queue_index) ||
skb_queue_len(&ieee->skb_waitQ[tcb_desc->queue_index]) || skb_queue_len(&ieee->skb_waitq[tcb_desc->queue_index]) ||
ieee->queue_stop) { ieee->queue_stop) {
/* insert the skb packet to the management queue /* insert the skb packet to the management queue
* *
@ -246,7 +246,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct rtllib_device *ieee)
netdev_info(ieee->dev, netdev_info(ieee->dev,
"%s():insert to waitqueue, queue_index:%d!\n", "%s():insert to waitqueue, queue_index:%d!\n",
__func__, tcb_desc->queue_index); __func__, tcb_desc->queue_index);
skb_queue_tail(&ieee->skb_waitQ[tcb_desc->queue_index], skb_queue_tail(&ieee->skb_waitq[tcb_desc->queue_index],
skb); skb);
} else { } else {
ieee->softmac_hard_start_xmit(skb, ieee->dev); ieee->softmac_hard_start_xmit(skb, ieee->dev);
@ -1823,7 +1823,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee)
* the wait queue * the wait queue
*/ */
for (i = 0; i < txb->nr_frags; i++) { for (i = 0; i < txb->nr_frags; i++) {
queue_len = skb_queue_len(&ieee->skb_waitQ[queue_index]); queue_len = skb_queue_len(&ieee->skb_waitq[queue_index]);
if ((queue_len != 0) || if ((queue_len != 0) ||
(!ieee->check_nic_enough_desc(ieee->dev, queue_index)) || (!ieee->check_nic_enough_desc(ieee->dev, queue_index)) ||
(ieee->queue_stop)) { (ieee->queue_stop)) {
@ -1832,7 +1832,7 @@ void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee)
* to check it any more. * to check it any more.
*/ */
if (queue_len < 200) if (queue_len < 200)
skb_queue_tail(&ieee->skb_waitQ[queue_index], skb_queue_tail(&ieee->skb_waitq[queue_index],
txb->fragments[i]); txb->fragments[i]);
else else
kfree_skb(txb->fragments[i]); kfree_skb(txb->fragments[i]);