Commit 1c194ce9 authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman

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: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ef43de1
...@@ -597,8 +597,8 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb) ...@@ -597,8 +597,8 @@ int ieee80211_rx_DELBA(struct ieee80211_device *ieee, struct sk_buff *skb)
pTxTs->using_ba = false; pTxTs->using_ba = false;
pTxTs->add_ba_req_in_progress = false; pTxTs->add_ba_req_in_progress = false;
pTxTs->add_ba_req_delayed = false; pTxTs->add_ba_req_delayed = false;
del_timer_sync(&pTxTs->TsAddBaTimer); del_timer_sync(&pTxTs->ts_add_ba_timer);
//PlatformCancelTimer(Adapter, &pTxTs->TsAddBaTimer); //PlatformCancelTimer(Adapter, &pTxTs->ts_add_ba_timer);
TxTsDeleteBA(ieee, pTxTs); TxTsDeleteBA(ieee, pTxTs);
} }
return 0; return 0;
......
...@@ -35,7 +35,7 @@ struct tx_ts_record { ...@@ -35,7 +35,7 @@ struct tx_ts_record {
u8 add_ba_req_in_progress; u8 add_ba_req_in_progress;
u8 add_ba_req_delayed; u8 add_ba_req_delayed;
u8 using_ba; u8 using_ba;
struct timer_list TsAddBaTimer; struct timer_list ts_add_ba_timer;
u8 num; u8 num;
}; };
......
...@@ -92,7 +92,7 @@ static void RxPktPendingTimeout(struct timer_list *t) ...@@ -92,7 +92,7 @@ static void RxPktPendingTimeout(struct timer_list *t)
********************************************************************************************************************/ ********************************************************************************************************************/
static void TsAddBaProcess(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; u8 num = pTxTs->num;
struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[num]); struct ieee80211_device *ieee = container_of(pTxTs, struct ieee80211_device, TxTsRecord[num]);
...@@ -150,7 +150,7 @@ void TSInitialize(struct ieee80211_device *ieee) ...@@ -150,7 +150,7 @@ void TSInitialize(struct ieee80211_device *ieee)
0); 0);
timer_setup(&pTxTS->ts_common_info.inact_timer, TsInactTimeout, timer_setup(&pTxTS->ts_common_info.inact_timer, TsInactTimeout,
0); 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, timer_setup(&pTxTS->tx_pending_ba_record.Timer, BaSetupTimeOut,
0); 0);
timer_setup(&pTxTS->tx_admitted_ba_record.Timer, timer_setup(&pTxTS->tx_admitted_ba_record.Timer,
...@@ -448,7 +448,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info * ...@@ -448,7 +448,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *
//#endif //#endif
} else { } else {
struct tx_ts_record *pTxTS = (struct tx_ts_record *)pTs; 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 ...@@ -526,11 +526,11 @@ void TsStartAddBaProcess(struct ieee80211_device *ieee, struct tx_ts_record *pTx
pTxTS->add_ba_req_in_progress = true; pTxTS->add_ba_req_in_progress = true;
if(pTxTS->add_ba_req_delayed) { if(pTxTS->add_ba_req_delayed) {
IEEE80211_DEBUG(IEEE80211_DL_BA, "TsStartAddBaProcess(): Delayed Start ADDBA after 60 sec!!\n"); 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)); jiffies + msecs_to_jiffies(TS_ADDBA_DELAY));
} else { } else {
IEEE80211_DEBUG(IEEE80211_DL_BA,"TsStartAddBaProcess(): Immediately Start ADDBA now!!\n"); 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 { } else {
IEEE80211_DEBUG(IEEE80211_DL_ERR, "%s()==>BA timer is already added\n", __func__); IEEE80211_DEBUG(IEEE80211_DL_ERR, "%s()==>BA timer is already added\n", __func__);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment