staging:rtl8192u: Refactor union TSPEC_BODY - Style

The union TSPEC_BODY is never used as a union. The union comprises an
array of bytes and a bitfield structure, both of which are 55 bytes in
length, but the byte array is never used. As a result the union has
been truncated to the bitfield struct, which is actually used.

Additionally the typedef has been removed from the structure to clear
the checkpatch issue with defining new types. Additionally the name has
been changed to lowercase to comply with coding style.

These changes are all coding style changes which should have no impact
on runtime code 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 96fab43c1cfef0a0392da4d21a2196a2d01a1514..d35f10c695e4203f39d5651ab6aea88b509e55d2 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c
@@ -626,7 +626,7 @@ TsInitAddBA(
        pBA->DialogToken++;                                             // DialogToken: Only keep the latest dialog token
        pBA->BaParamSet.field.AMSDU_Support = 0;        // Do not support A-MSDU with A-MPDU now!!
        pBA->BaParamSet.field.BAPolicy = Policy;        // Policy: Delayed or Immediate
-       pBA->BaParamSet.field.TID = pTS->ts_common_info.t_spec.f.TSInfo.uc_tsid;        // TID
+       pBA->BaParamSet.field.TID = pTS->ts_common_info.t_spec.TSInfo.uc_tsid;  // TID
        // BufferSize: This need to be set according to A-MPDU vector
        pBA->BaParamSet.field.BufferSize = 32;          // BufferSize: This need to be set according to A-MPDU vector
        pBA->BaTimeoutValue = 0;                                        // Timeout value: Set 0 to disable Timer

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
index d36a14197b4c518034ce4787907822be2bef6079..a4cecf4cc7569aed1978665198cc985dc00e5b84 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h
@@ -46,32 +46,29 @@ struct qos_tsinfo {
        u8:7;
 };
 
-//
-// WMM TSPEC Body.
-// Ref: WMM spec 2.2.11: WME TSPEC Element, p.16.
-//
-typedef union _TSPEC_BODY {
-       u8              charData[55];
-
-       struct {
-               struct qos_tsinfo       TSInfo; //u8    TSInfo[3];
-               u16     NominalMSDUsize;
-               u16     MaxMSDUsize;
-               u32     MinServiceItv;
-               u32     MaxServiceItv;
-               u32     InactivityItv;
-               u32     SuspenItv;
-               u32     ServiceStartTime;
-               u32     MinDataRate;
-               u32     MeanDataRate;
-               u32     PeakDataRate;
-               u32     MaxBurstSize;
-               u32     DelayBound;
-               u32     MinPhyRate;
-               u16     SurplusBandwidthAllowance;
-               u16     MediumTime;
-       } f;    // Field
-} TSPEC_BODY, *PTSPEC_BODY;
+/*
+ * WMM TSPEC Body.
+ * Ref: WMM spec 2.2.11: WME TSPEC Element, p.16.
+ * Note: sizeof 55 bytes
+ */
+struct tspec_body {
+       struct qos_tsinfo       TSInfo; //u8    TSInfo[3];
+       u16     NominalMSDUsize;
+       u16     MaxMSDUsize;
+       u32     MinServiceItv;
+       u32     MaxServiceItv;
+       u32     InactivityItv;
+       u32     SuspenItv;
+       u32     ServiceStartTime;
+       u32     MinDataRate;
+       u32     MeanDataRate;
+       u32     PeakDataRate;
+       u32     MaxBurstSize;
+       u32     DelayBound;
+       u32     MinPhyRate;
+       u16     SurplusBandwidthAllowance;
+       u16     MediumTime;
+};
 
 //typedef struct _TCLASS{
 // TODO

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h b/drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h
index f5e79853fe9c589b4bbcd891dda29e2e28a4d5fc..a9f865f810ceb925cdc148056cb3a090ad11fd14 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 timer_list               setup_timer;
        struct timer_list               inact_timer;
        u8                              addr[6];
-       TSPEC_BODY                      t_spec;
+       struct tspec_body               t_spec;
        QOS_TCLAS                       t_class[TCLAS_NUM];
        u8                              t_clas_proc;
        u8                              t_clas_num;

diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
index 076278dae321350bcb046a94db108e23ba9f938a..bd2b4e5dfa60644143a3b8ac6ac6440387d4ee49 100644 (file)
--- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
+++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c
@@ -104,7 +104,7 @@ static void TsAddBaProcess(struct timer_list *t)
 static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)
 {
        eth_zero_addr(pTsCommonInfo->addr);
-       memset(&pTsCommonInfo->t_spec, 0, sizeof(TSPEC_BODY));
+       memset(&pTsCommonInfo->t_spec, 0, sizeof(struct tspec_body));
        memset(&pTsCommonInfo->t_class, 0, sizeof(QOS_TCLAS)*TCLAS_NUM);
        pTsCommonInfo->t_clas_proc = 0;
        pTsCommonInfo->t_clas_num = 0;
@@ -246,10 +246,10 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee,
                if (!search_dir[dir])
                        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.ucTSID, pRet->TSpec.f.TSInfo.ucDirection);
+       //              IEEE80211_DEBUG(IEEE80211_DL_TS, "ADD:%pM, TID:%d, dir:%d\n", pRet->Addr, pRet->TSpec.TSInfo.ucTSID, pRet->TSpec.TSInfo.ucDirection);
                        if (memcmp(pRet->addr, Addr, 6) == 0)
-                               if (pRet->t_spec.f.TSInfo.uc_tsid == TID)
-                                       if(pRet->t_spec.f.TSInfo.uc_direction == dir) {
+                               if (pRet->t_spec.TSInfo.uc_tsid == TID)
+                                       if(pRet->t_spec.TSInfo.uc_direction == dir) {
        //                                      printk("Bingo! got it\n");
                                                break;
                                        }
@@ -265,7 +265,7 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee,
 }
 
 static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *Addr,
-                       PTSPEC_BODY pTSPEC, PQOS_TCLAS pTCLAS, u8 TCLAS_Num,
+                       struct tspec_body *pTSPEC, PQOS_TCLAS pTCLAS, u8 TCLAS_Num,
                        u8 TCLAS_Proc)
 {
        u8      count;
@@ -276,7 +276,7 @@ static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *Addr,
        memcpy(pTsCommonInfo->addr, Addr, 6);
 
        if(pTSPEC != NULL)
-               memcpy((u8 *)(&(pTsCommonInfo->t_spec)), (u8 *)pTSPEC, sizeof(TSPEC_BODY));
+               memcpy((u8 *)(&(pTsCommonInfo->t_spec)), (u8 *)pTSPEC, sizeof(struct tspec_body));
 
        for(count = 0; count < TCLAS_Num; count++)
                memcpy((u8 *)(&(pTsCommonInfo->t_class[count])), (u8 *)pTCLAS, sizeof(QOS_TCLAS));
@@ -354,8 +354,8 @@ bool GetTs(
                        // This is for EDCA and WMM to add a new TS.
                        // For HCCA or WMMSA, TS cannot be addmit without negotiation.
                        //
-                       TSPEC_BODY      TSpec;
-                       struct qos_tsinfo       *pTSInfo = &TSpec.f.TSInfo;
+                       struct tspec_body       TSpec;
+                       struct qos_tsinfo       *pTSInfo = &TSpec.TSInfo;
                        struct list_head        *pUnusedList =
                                                                (TxRxSelect == TX_DIR)?
                                                                (&ieee->Tx_TS_Unused_List):