staging:rtl8192u: Rename Addr > addr - Style

Rename the TX_COMMON_INFO structure's member Addr to addr. This change
clears the checkpatch issue with CamelCase naming. This is a coding style
change only and should not impact runtime 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 950f827a1740bee4c44cd1755e2a12aba98bac4b..297c498aef6a469afae2296990334a6e245b6089 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -634,7 +634,7 @@ TsInitAddBA(
 
        ActivateBAEntry(ieee, pBA, BA_SETUP_TIMEOUT);
 
-       ieee80211_send_ADDBAReq(ieee, pTS->TsCommonInfo.Addr, pBA);
+       ieee80211_send_ADDBAReq(ieee, pTS->TsCommonInfo.addr, pBA);
 }
 
 void
@@ -646,7 +646,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo,
                if (TxTsDeleteBA(ieee, pTxTs))
                        ieee80211_send_DELBA(
                                ieee,
-                               pTsCommonInfo->Addr,
+                               pTsCommonInfo->addr,
                                (pTxTs->TxAdmittedBARecord.bValid)?(&pTxTs->TxAdmittedBARecord):(&pTxTs->TxPendingBARecord),
                                TxRxSelect,
                                DELBA_REASON_END_BA);
@@ -655,7 +655,7 @@ TsInitDelBA(struct ieee80211_device *ieee, struct ts_common_info *pTsCommonInfo,
                if (RxTsDeleteBA(ieee, pRxTs))
                        ieee80211_send_DELBA(
                                ieee,
-                               pTsCommonInfo->Addr,
+                               pTsCommonInfo->addr,
                                &pRxTs->RxAdmittedBARecord,
                                TxRxSelect,
                                DELBA_REASON_END_BA);
@@ -683,7 +683,7 @@ void TxBaInactTimeout(struct timer_list *t)
        TxTsDeleteBA(ieee, pTxTs);
        ieee80211_send_DELBA(
                ieee,
-               pTxTs->TsCommonInfo.Addr,
+               pTxTs->TsCommonInfo.addr,
                &pTxTs->TxAdmittedBARecord,
                TX_DIR,
                DELBA_REASON_TIMEOUT);
@@ -697,7 +697,7 @@ void RxBaInactTimeout(struct timer_list *t)
        RxTsDeleteBA(ieee, pRxTs);
        ieee80211_send_DELBA(
                ieee,
-               pRxTs->TsCommonInfo.Addr,
+               pRxTs->TsCommonInfo.addr,
                &pRxTs->RxAdmittedBARecord,
                RX_DIR,
                DELBA_REASON_TIMEOUT);

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
index 1613c3c5d4477a81d50a5f43a1b609ca1dd71037..62c6fc513540d4b9232aa99432be6180750a4218 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
@@ -19,7 +19,7 @@ struct ts_common_info {
        struct list_head                list;
        struct timer_list               setup_timer;
        struct timer_list               inact_timer;
-       u8                              Addr[6];
+       u8                              addr[6];
        TSPEC_BODY                      TSpec;
        QOS_TCLAS                       TClass[TCLAS_NUM];
        u8                              TClasProc;

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
index 175d91218af8fcd594658f66575fa2425dcdec9f..72a5fc0bbb475396a4fa1fa5a2e00e8da586310b 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
@@ -103,7 +103,7 @@ static void TsAddBaProcess(struct timer_list *t)
 
 static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)
 {
-       eth_zero_addr(pTsCommonInfo->Addr);
+       eth_zero_addr(pTsCommonInfo->addr);
        memset(&pTsCommonInfo->TSpec, 0, sizeof(TSPEC_BODY));
        memset(&pTsCommonInfo->TClass, 0, sizeof(QOS_TCLAS)*TCLAS_NUM);
        pTsCommonInfo->TClasProc = 0;
@@ -247,7 +247,7 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee,
                        continue;
                list_for_each_entry(pRet, psearch_list, list){
        //              IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:%pM, TID:%d, dir:%d\n", pRet->Addr, pRet->TSpec.f.TSInfo.field.ucTSID, pRet->TSpec.f.TSInfo.field.ucDirection);
-                       if (memcmp(pRet->Addr, Addr, 6) == 0)
+                       if (memcmp(pRet->addr, Addr, 6) == 0)
                                if (pRet->TSpec.f.TSInfo.field.ucTSID == TID)
                                        if(pRet->TSpec.f.TSInfo.field.ucDirection == dir) {
        //                                      printk("Bingo! got it\n");
@@ -273,7 +273,7 @@ static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *Addr,
        if(pTsCommonInfo == NULL)
                return;
 
-       memcpy(pTsCommonInfo->Addr, Addr, 6);
+       memcpy(pTsCommonInfo->addr, Addr, 6);
 
        if(pTSPEC != NULL)
                memcpy((u8 *)(&(pTsCommonInfo->TSpec)), (u8 *)pTSPEC, sizeof(TSPEC_BODY));
@@ -458,7 +458,7 @@ void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr)
 
        printk("===========>RemovePeerTS,%pM\n", Addr);
        list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, list) {
-               if (memcmp(pTS->Addr, Addr, 6) == 0) {
+               if (memcmp(pTS->addr, Addr, 6) == 0) {
                        RemoveTsEntry(ieee, pTS, TX_DIR);
                        list_del_init(&pTS->list);
                        list_add_tail(&pTS->list, &ieee->Tx_TS_Unused_List);
@@ -466,7 +466,7 @@ void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr)
        }
 
        list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Admit_List, list) {
-               if (memcmp(pTS->Addr, Addr, 6) == 0) {
+               if (memcmp(pTS->addr, Addr, 6) == 0) {
                        printk("====>remove Tx_TS_admin_list\n");
                        RemoveTsEntry(ieee, pTS, TX_DIR);
                        list_del_init(&pTS->list);
@@ -475,7 +475,7 @@ void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr)
        }
 
        list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Pending_List, list) {
-               if (memcmp(pTS->Addr, Addr, 6) == 0) {
+               if (memcmp(pTS->addr, Addr, 6) == 0) {
                        RemoveTsEntry(ieee, pTS, RX_DIR);
                        list_del_init(&pTS->list);
                        list_add_tail(&pTS->list, &ieee->Rx_TS_Unused_List);
@@ -483,7 +483,7 @@ void RemovePeerTS(struct ieee80211_device *ieee, u8 *Addr)
        }
 
        list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Admit_List, list) {
-               if (memcmp(pTS->Addr, Addr, 6) == 0) {
+               if (memcmp(pTS->addr, Addr, 6) == 0) {
                        RemoveTsEntry(ieee, pTS, RX_DIR);
                        list_del_init(&pTS->list);
                        list_add_tail(&pTS->list, &ieee->Rx_TS_Unused_List);