[PATCH 04/10] 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: John Whitmore
---
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +-
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 8
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
index bf1e01cde407..4601e5fd3e9c 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
@@ -17,7 +17,7 @@ enum TR_SELECT {
struct TS_COMMON_INFO {
struct list_headlist;
- struct timer_list SetupTimer;
+ struct timer_list setup_timer;
struct timer_list InactTimer;
u8 Addr[6];
TSPEC_BODY TSpec;
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
index cc6fdcb7c5fb..cda20ee023b2 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
@@ -146,7 +146,7 @@ void TSInitialize(struct ieee80211_device *ieee)
pTxTS->num = count;
// The timers for the operation of Traffic Stream and Block Ack.
// DLS related timer will be add here in the future!!
- timer_setup(>TsCommonInfo.SetupTimer, TsSetupTimeOut,
+ timer_setup(>TsCommonInfo.setup_timer, TsSetupTimeOut,
0);
timer_setup(>TsCommonInfo.InactTimer, TsInactTimeout,
0);
@@ -167,7 +167,7 @@ void TSInitialize(struct ieee80211_device *ieee)
for(count = 0; count < TOTAL_TS_NUM; count++) {
pRxTS->num = count;
INIT_LIST_HEAD(>RxPendingPktList);
- timer_setup(>TsCommonInfo.SetupTimer, TsSetupTimeOut,
+ timer_setup(>TsCommonInfo.setup_timer, TsSetupTimeOut,
0);
timer_setup(>TsCommonInfo.InactTimer, TsInactTimeout,
0);
@@ -193,7 +193,7 @@ void TSInitialize(struct ieee80211_device *ieee)
static void AdmitTS(struct ieee80211_device *ieee,
struct TS_COMMON_INFO *pTsCommonInfo, u32 InactTime)
{
- del_timer_sync(>SetupTimer);
+ del_timer_sync(>setup_timer);
del_timer_sync(>InactTimer);
if(InactTime!=0)
@@ -412,7 +412,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee,
struct TS_COMMON_INFO *
{
//u32 flags = 0;
unsigned long flags = 0;
- del_timer_sync(>SetupTimer);
+ del_timer_sync(>setup_timer);
del_timer_sync(>InactTimer);
TsInitDelBA(ieee, pTs, TxRxSelect);
--
2.18.0
[PATCH 04/10] 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: John Whitmore
---
drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +-
drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 8
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
index bf1e01cde407..4601e5fd3e9c 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
@@ -17,7 +17,7 @@ enum TR_SELECT {
struct TS_COMMON_INFO {
struct list_headlist;
- struct timer_list SetupTimer;
+ struct timer_list setup_timer;
struct timer_list InactTimer;
u8 Addr[6];
TSPEC_BODY TSpec;
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
index cc6fdcb7c5fb..cda20ee023b2 100644
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
@@ -146,7 +146,7 @@ void TSInitialize(struct ieee80211_device *ieee)
pTxTS->num = count;
// The timers for the operation of Traffic Stream and Block Ack.
// DLS related timer will be add here in the future!!
- timer_setup(>TsCommonInfo.SetupTimer, TsSetupTimeOut,
+ timer_setup(>TsCommonInfo.setup_timer, TsSetupTimeOut,
0);
timer_setup(>TsCommonInfo.InactTimer, TsInactTimeout,
0);
@@ -167,7 +167,7 @@ void TSInitialize(struct ieee80211_device *ieee)
for(count = 0; count < TOTAL_TS_NUM; count++) {
pRxTS->num = count;
INIT_LIST_HEAD(>RxPendingPktList);
- timer_setup(>TsCommonInfo.SetupTimer, TsSetupTimeOut,
+ timer_setup(>TsCommonInfo.setup_timer, TsSetupTimeOut,
0);
timer_setup(>TsCommonInfo.InactTimer, TsInactTimeout,
0);
@@ -193,7 +193,7 @@ void TSInitialize(struct ieee80211_device *ieee)
static void AdmitTS(struct ieee80211_device *ieee,
struct TS_COMMON_INFO *pTsCommonInfo, u32 InactTime)
{
- del_timer_sync(>SetupTimer);
+ del_timer_sync(>setup_timer);
del_timer_sync(>InactTimer);
if(InactTime!=0)
@@ -412,7 +412,7 @@ static void RemoveTsEntry(struct ieee80211_device *ieee,
struct TS_COMMON_INFO *
{
//u32 flags = 0;
unsigned long flags = 0;
- del_timer_sync(>SetupTimer);
+ del_timer_sync(>setup_timer);
del_timer_sync(>InactTimer);
TsInitDelBA(ieee, pTs, TxRxSelect);
--
2.18.0
