staging:rtl8192u: Rename TsAddBaTimer - Style

Rename the member variable TsAddBaTimer to ts_add_ba_timer. This change
clears the checkpatch issue with CamelCase naming.

The resulting changes are coding style in nature and as such should not
have any impact on runtime code execution.

Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
index 7bd2d0fb2ebb69fa3535040bf1d819cbbd10eaf0..01bf9f3488abb160f8bf1158510a985e0e6be6bf 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -597,8 +597,8 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)
                pTxTs->using_ba = false;
                pTxTs->add_ba_req_in_progress = false;
                pTxTs->add_ba_req_delayed = false;
-               del_timer_sync(&pTxTs->TsAddBaTimer);
-               //PlatformCancelTimer(Adapter, &pTxTs->TsAddBaTimer);
+               del_timer_sync(&pTxTs->ts_add_ba_timer);
+               //PlatformCancelTimer(Adapter, &pTxTs->ts_add_ba_timer);
                TxTsDeleteBA(ieee, pTxTs);
        }
        return 0;

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
index 4cb53c75f43830698bba01c0e8b681d06ccfd917..b878ff5f7d0f5d88405dacd028a21a781ffd8a5e 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
@@ -35,7 +35,7 @@ struct tx_ts_record {
        u8                              add_ba_req_in_progress;
        u8                              add_ba_req_delayed;
        u8                              using_ba;
-       struct timer_list               TsAddBaTimer;
+       struct timer_list               ts_add_ba_timer;
        u8                              num;
 };
 

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
index 09fb339203aade95592ea0ed3e9fbf54b4ed4443..399e97ce62b47ce97d0cffb1c7589a38f6c27a27 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
@@ -92,7 +92,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
  ********************************************************************************************************************/
 static void TsAddBaProcess(struct timer_list *t)
 {
-       struct tx_ts_record *pTxTs = from_timer(pTxTs, t, TsAddBaTimer);
+       struct tx_ts_record *pTxTs = from_timer(pTxTs, t, ts_add_ba_timer);
        u8 num = pTxTs->num;
        struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[num]);
 
@@ -150,7 +150,7 @@ void TSInitialize(struct ieee80211_device *ieee)
                            0);
                timer_setup(&pTxTS->ts_common_info.inact_timer, TsInactTimeout,
                            0);
-               timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0);
+               timer_setup(&pTxTS->ts_add_ba_timer, TsAddBaProcess, 0);
                timer_setup(&pTxTS->tx_pending_ba_record.Timer, BaSetupTimeOut,
                            0);
                timer_setup(&pTxTS->tx_admitted_ba_record.Timer,
@@ -448,7 +448,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *
 //#endif
        } else {
                struct tx_ts_record *pTxTS = (struct tx_ts_record *)pTs;
-               del_timer_sync(&pTxTS->TsAddBaTimer);
+               del_timer_sync(&pTxTS->ts_add_ba_timer);
        }
 }
 
@@ -526,11 +526,11 @@ void TsStartAddBaProcess(struct ieee80211_device *ieee, struct tx_ts_record *pTx
                pTxTS->add_ba_req_in_progress = true;
                if(pTxTS->add_ba_req_delayed)   {
                        IEEE80211_DEBUG(IEEE80211_DL_BA, "TsStartAddBaProcess(): Delayed Start ADDBA after 60 sec!!\n");
-                       mod_timer(&pTxTS->TsAddBaTimer,
+                       mod_timer(&pTxTS->ts_add_ba_timer,
                                  jiffies + msecs_to_jiffies(TS_ADDBA_DELAY));
                } else {
                        IEEE80211_DEBUG(IEEE80211_DL_BA,"TsStartAddBaProcess(): Immediately Start ADDBA now!!\n");
-                       mod_timer(&pTxTS->TsAddBaTimer, jiffies+10); //set 10 ticks
+                       mod_timer(&pTxTS->ts_add_ba_timer, jiffies+10); //set 10 ticks
                }
        } else {
                IEEE80211_DEBUG(IEEE80211_DL_ERR, "%s()==>BA timer is already added\n", __func__);