Commit 27c4a9bb authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman

staging:rtl8192u: Rename InactTimer > inact_timer - Style

Rename the struct TS_COMMON_INFO member InactTimer to inact_timer.
This change clears the checkpatch issue with CamelCase naming. The change
should not have any impact on runtime execution.
Signed-off-by: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36cf191f
...@@ -18,7 +18,7 @@ enum tr_select { ...@@ -18,7 +18,7 @@ enum tr_select {
struct ts_common_info { struct ts_common_info {
struct list_head list; struct list_head list;
struct timer_list setup_timer; struct timer_list setup_timer;
struct timer_list InactTimer; struct timer_list inact_timer;
u8 Addr[6]; u8 Addr[6];
TSPEC_BODY TSpec; TSPEC_BODY TSpec;
QOS_TCLAS TClass[TCLAS_NUM]; QOS_TCLAS TClass[TCLAS_NUM];
......
...@@ -148,7 +148,7 @@ void TSInitialize(struct ieee80211_device *ieee) ...@@ -148,7 +148,7 @@ void TSInitialize(struct ieee80211_device *ieee)
// DLS related timer will be add here in the future!! // DLS related timer will be add here in the future!!
timer_setup(&pTxTS->TsCommonInfo.setup_timer, TsSetupTimeOut, timer_setup(&pTxTS->TsCommonInfo.setup_timer, TsSetupTimeOut,
0); 0);
timer_setup(&pTxTS->TsCommonInfo.InactTimer, TsInactTimeout, timer_setup(&pTxTS->TsCommonInfo.inact_timer, TsInactTimeout,
0); 0);
timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0); timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0);
timer_setup(&pTxTS->TxPendingBARecord.Timer, BaSetupTimeOut, timer_setup(&pTxTS->TxPendingBARecord.Timer, BaSetupTimeOut,
...@@ -169,7 +169,7 @@ void TSInitialize(struct ieee80211_device *ieee) ...@@ -169,7 +169,7 @@ void TSInitialize(struct ieee80211_device *ieee)
INIT_LIST_HEAD(&pRxTS->RxPendingPktList); INIT_LIST_HEAD(&pRxTS->RxPendingPktList);
timer_setup(&pRxTS->TsCommonInfo.setup_timer, TsSetupTimeOut, timer_setup(&pRxTS->TsCommonInfo.setup_timer, TsSetupTimeOut,
0); 0);
timer_setup(&pRxTS->TsCommonInfo.InactTimer, TsInactTimeout, timer_setup(&pRxTS->TsCommonInfo.inact_timer, TsInactTimeout,
0); 0);
timer_setup(&pRxTS->RxAdmittedBARecord.Timer, timer_setup(&pRxTS->RxAdmittedBARecord.Timer,
RxBaInactTimeout, 0); RxBaInactTimeout, 0);
...@@ -194,10 +194,10 @@ static void AdmitTS(struct ieee80211_device *ieee, ...@@ -194,10 +194,10 @@ 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->setup_timer); del_timer_sync(&pTsCommonInfo->setup_timer);
del_timer_sync(&pTsCommonInfo->InactTimer); del_timer_sync(&pTsCommonInfo->inact_timer);
if(InactTime!=0) if(InactTime!=0)
mod_timer(&pTsCommonInfo->InactTimer, mod_timer(&pTsCommonInfo->inact_timer,
jiffies + msecs_to_jiffies(InactTime)); jiffies + msecs_to_jiffies(InactTime));
} }
...@@ -413,7 +413,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee, struct ts_common_info * ...@@ -413,7 +413,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->setup_timer); del_timer_sync(&pTs->setup_timer);
del_timer_sync(&pTs->InactTimer); del_timer_sync(&pTs->inact_timer);
TsInitDelBA(ieee, pTs, TxRxSelect); TsInitDelBA(ieee, pTs, TxRxSelect);
if(TxRxSelect == RX_DIR) { if(TxRxSelect == RX_DIR) {
......
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