Commit 36cf191f authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman

staging:rtl8192u: rename SetupTimer > setup_timer - Style

Rename the struct TS_COMMON_INFO member SetupTimer to setup_timer. This
clears the checkpatch issue with CamelCase variable names.
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d48cc3c3
...@@ -17,7 +17,7 @@ enum tr_select { ...@@ -17,7 +17,7 @@ enum tr_select {
struct ts_common_info { struct ts_common_info {
struct list_head list; struct list_head list;
struct timer_list SetupTimer; struct timer_list setup_timer;
struct timer_list InactTimer; struct timer_list InactTimer;
u8 Addr[6]; u8 Addr[6];
TSPEC_BODY TSpec; TSPEC_BODY TSpec;
......
...@@ -146,7 +146,7 @@ void TSInitialize(struct ieee80211_device *ieee) ...@@ -146,7 +146,7 @@ void TSInitialize(struct ieee80211_device *ieee)
pTxTS->num = count; pTxTS->num = count;
// The timers for the operation of Traffic Stream and Block Ack. // The timers for the operation of Traffic Stream and Block Ack.
// DLS related timer will be add here in the future!! // DLS related timer will be add here in the future!!
timer_setup(&pTxTS->TsCommonInfo.SetupTimer, TsSetupTimeOut, timer_setup(&pTxTS->TsCommonInfo.setup_timer, TsSetupTimeOut,
0); 0);
timer_setup(&pTxTS->TsCommonInfo.InactTimer, TsInactTimeout, timer_setup(&pTxTS->TsCommonInfo.InactTimer, TsInactTimeout,
0); 0);
...@@ -167,7 +167,7 @@ void TSInitialize(struct ieee80211_device *ieee) ...@@ -167,7 +167,7 @@ void TSInitialize(struct ieee80211_device *ieee)
for(count = 0; count < TOTAL_TS_NUM; count++) { for(count = 0; count < TOTAL_TS_NUM; count++) {
pRxTS->num = count; pRxTS->num = count;
INIT_LIST_HEAD(&pRxTS->RxPendingPktList); INIT_LIST_HEAD(&pRxTS->RxPendingPktList);
timer_setup(&pRxTS->TsCommonInfo.SetupTimer, TsSetupTimeOut, timer_setup(&pRxTS->TsCommonInfo.setup_timer, TsSetupTimeOut,
0); 0);
timer_setup(&pRxTS->TsCommonInfo.InactTimer, TsInactTimeout, timer_setup(&pRxTS->TsCommonInfo.InactTimer, TsInactTimeout,
0); 0);
...@@ -193,7 +193,7 @@ void TSInitialize(struct ieee80211_device *ieee) ...@@ -193,7 +193,7 @@ void TSInitialize(struct ieee80211_device *ieee)
static void AdmitTS(struct ieee80211_device *ieee, static void AdmitTS(struct ieee80211_device *ieee,
struct ts_common_info *pTsCommonInfo, u32 InactTime) struct ts_common_info *pTsCommonInfo, u32 InactTime)
{ {
del_timer_sync(&pTsCommonInfo->SetupTimer); del_timer_sync(&pTsCommonInfo->setup_timer);
del_timer_sync(&pTsCommonInfo->InactTimer); del_timer_sync(&pTsCommonInfo->InactTimer);
if(InactTime!=0) if(InactTime!=0)
...@@ -412,7 +412,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info * ...@@ -412,7 +412,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info *
{ {
//u32 flags = 0; //u32 flags = 0;
unsigned long flags = 0; unsigned long flags = 0;
del_timer_sync(&pTs->SetupTimer); del_timer_sync(&pTs->setup_timer);
del_timer_sync(&pTs->InactTimer); del_timer_sync(&pTs->InactTimer);
TsInitDelBA(ieee, pTs, TxRxSelect); TsInitDelBA(ieee, pTs, TxRxSelect);
......
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