iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Staging: rtl8192e: Rename variable NumTxOkInPeriod

Browse Source 
Rename variable NumTxOkInPeriod to num_tx_ok_in_period to fix checkpatch
warning Avoid CamelCase.

Signed-off-by: Tree Davies <tdavies@darkphysics.net>
Link: https://lore.kernel.org/r/20231225202314.31869-3-tdavies@darkphysics.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tree Davies
2023-12-25 12:23:10 -08:00
committed by Greg Kroah-Hartman
parent d65a2fc00f
commit a24e0197f3
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -972,11 +972,11 @@ static void _rtl92e_watchdog_wq_cb(void *data)
} }
if ((ieee->link_state == MAC80211_LINKED) && (ieee->iw_mode == IW_MODE_INFRA)) { if ((ieee->link_state == MAC80211_LINKED) && (ieee->iw_mode == IW_MODE_INFRA)) {
if (ieee->link_detect_info.NumRxOkInPeriod > 100 || if (ieee->link_detect_info.NumRxOkInPeriod > 100 ||
ieee->link_detect_info.NumTxOkInPeriod > 100) ieee->link_detect_info.num_tx_ok_in_period > 100)
bBusyTraffic = true; bBusyTraffic = true;
if (ieee->link_detect_info.NumRxOkInPeriod > 4000 || if (ieee->link_detect_info.NumRxOkInPeriod > 4000 ||
ieee->link_detect_info.NumTxOkInPeriod > 4000) { ieee->link_detect_info.num_tx_ok_in_period > 4000) {
bHigherBusyTraffic = true; bHigherBusyTraffic = true;
if (ieee->link_detect_info.NumRxOkInPeriod > 5000) if (ieee->link_detect_info.NumRxOkInPeriod > 5000)
bHigherBusyRxTraffic = true; bHigherBusyRxTraffic = true;
@@ -985,7 +985,7 @@ static void _rtl92e_watchdog_wq_cb(void *data)
} }
if (((ieee->link_detect_info.NumRxUnicastOkInPeriod + if (((ieee->link_detect_info.NumRxUnicastOkInPeriod +
ieee->link_detect_info.NumTxOkInPeriod) > 8) || ieee->link_detect_info.num_tx_ok_in_period) > 8) ||
(ieee->link_detect_info.NumRxUnicastOkInPeriod > 2)) (ieee->link_detect_info.NumRxUnicastOkInPeriod > 2))
bEnterPS = false; bEnterPS = false;
else else
@@ -1004,7 +1004,7 @@ static void _rtl92e_watchdog_wq_cb(void *data)
} }
ieee->link_detect_info.NumRxOkInPeriod = 0; ieee->link_detect_info.NumRxOkInPeriod = 0;
ieee->link_detect_info.NumTxOkInPeriod = 0; ieee->link_detect_info.num_tx_ok_in_period = 0;
ieee->link_detect_info.NumRxUnicastOkInPeriod = 0; ieee->link_detect_info.NumRxUnicastOkInPeriod = 0;
ieee->link_detect_info.bBusyTraffic = bBusyTraffic; ieee->link_detect_info.bBusyTraffic = bBusyTraffic;
@@ -1773,22 +1773,22 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev)
tasklet_schedule(&priv->irq_rx_tasklet); tasklet_schedule(&priv->irq_rx_tasklet);
if (inta & IMR_BKDOK) { if (inta & IMR_BKDOK) {
priv->rtllib->link_detect_info.NumTxOkInPeriod++; priv->rtllib->link_detect_info.num_tx_ok_in_period++;
_rtl92e_tx_isr(dev, BK_QUEUE); _rtl92e_tx_isr(dev, BK_QUEUE);
} }
if (inta & IMR_BEDOK) { if (inta & IMR_BEDOK) {
priv->rtllib->link_detect_info.NumTxOkInPeriod++; priv->rtllib->link_detect_info.num_tx_ok_in_period++;
_rtl92e_tx_isr(dev, BE_QUEUE); _rtl92e_tx_isr(dev, BE_QUEUE);
} }
if (inta & IMR_VIDOK) { if (inta & IMR_VIDOK) {
priv->rtllib->link_detect_info.NumTxOkInPeriod++; priv->rtllib->link_detect_info.num_tx_ok_in_period++;
_rtl92e_tx_isr(dev, VI_QUEUE); _rtl92e_tx_isr(dev, VI_QUEUE);
} }
if (inta & IMR_VODOK) { if (inta & IMR_VODOK) {
priv->rtllib->link_detect_info.NumTxOkInPeriod++; priv->rtllib->link_detect_info.num_tx_ok_in_period++;
_rtl92e_tx_isr(dev, VO_QUEUE); _rtl92e_tx_isr(dev, VO_QUEUE);
} }

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

@@ -1118,7 +1118,7 @@ struct rt_link_detect {
u16 SlotNum; u16 SlotNum;
u16 SlotIndex; u16 SlotIndex;
u32 NumTxOkInPeriod; u32 num_tx_ok_in_period;
u32 NumRxOkInPeriod; u32 NumRxOkInPeriod;
u32 NumRxUnicastOkInPeriod; u32 NumRxUnicastOkInPeriod;
bool bBusyTraffic; bool bBusyTraffic;

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

@@ -1150,7 +1150,7 @@ static void rtllib_rx_check_leave_lps(struct rtllib_device *ieee, u8 unicast,
if (unicast) { if (unicast) {
if (ieee->link_state == MAC80211_LINKED) { if (ieee->link_state == MAC80211_LINKED) {
if (((ieee->link_detect_info.NumRxUnicastOkInPeriod + if (((ieee->link_detect_info.NumRxUnicastOkInPeriod +
ieee->link_detect_info.NumTxOkInPeriod) > 8) || ieee->link_detect_info.num_tx_ok_in_period) > 8) ||
(ieee->link_detect_info.NumRxUnicastOkInPeriod > 2)) { (ieee->link_detect_info.NumRxUnicastOkInPeriod > 2)) {
ieee->leisure_ps_leave(ieee->dev); ieee->leisure_ps_leave(ieee->dev);
} }

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

@@ -2076,7 +2076,7 @@ int rtllib_softmac_init(struct rtllib_device *ieee)
ieee->link_detect_info.SlotNum = 2; ieee->link_detect_info.SlotNum = 2;
ieee->link_detect_info.NumRecvBcnInPeriod = 0; ieee->link_detect_info.NumRecvBcnInPeriod = 0;
ieee->link_detect_info.NumRecvDataInPeriod = 0; ieee->link_detect_info.NumRecvDataInPeriod = 0;
ieee->link_detect_info.NumTxOkInPeriod = 0; ieee->link_detect_info.num_tx_ok_in_period = 0;
ieee->link_detect_info.NumRxOkInPeriod = 0; ieee->link_detect_info.NumRxOkInPeriod = 0;
ieee->link_detect_info.NumRxUnicastOkInPeriod = 0; ieee->link_detect_info.NumRxUnicastOkInPeriod = 0;
ieee->bIsAggregateFrame = false; ieee->bIsAggregateFrame = false;