Commit 9365607a authored by John Whitmore's avatar John Whitmore Committed by Greg Kroah-Hartman

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: default avatarJohn Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0a679b93
...@@ -626,7 +626,7 @@ TsInitAddBA( ...@@ -626,7 +626,7 @@ TsInitAddBA(
pBA->DialogToken++; // DialogToken: Only keep the latest dialog token 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.AMSDU_Support = 0; // Do not support A-MSDU with A-MPDU now!!
pBA->BaParamSet.field.BAPolicy = Policy; // Policy: Delayed or Immediate 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 // 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->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 pBA->BaTimeoutValue = 0; // Timeout value: Set 0 to disable Timer
......
...@@ -46,32 +46,29 @@ struct qos_tsinfo { ...@@ -46,32 +46,29 @@ struct qos_tsinfo {
u8:7; u8:7;
}; };
// /*
// WMM TSPEC Body. * WMM TSPEC Body.
// Ref: WMM spec 2.2.11: WME TSPEC Element, p.16. * Ref: WMM spec 2.2.11: WME TSPEC Element, p.16.
// * Note: sizeof 55 bytes
typedef union _TSPEC_BODY { */
u8 charData[55]; struct tspec_body {
struct qos_tsinfo TSInfo; //u8 TSInfo[3];
struct { u16 NominalMSDUsize;
struct qos_tsinfo TSInfo; //u8 TSInfo[3]; u16 MaxMSDUsize;
u16 NominalMSDUsize; u32 MinServiceItv;
u16 MaxMSDUsize; u32 MaxServiceItv;
u32 MinServiceItv; u32 InactivityItv;
u32 MaxServiceItv; u32 SuspenItv;
u32 InactivityItv; u32 ServiceStartTime;
u32 SuspenItv; u32 MinDataRate;
u32 ServiceStartTime; u32 MeanDataRate;
u32 MinDataRate; u32 PeakDataRate;
u32 MeanDataRate; u32 MaxBurstSize;
u32 PeakDataRate; u32 DelayBound;
u32 MaxBurstSize; u32 MinPhyRate;
u32 DelayBound; u16 SurplusBandwidthAllowance;
u32 MinPhyRate; u16 MediumTime;
u16 SurplusBandwidthAllowance; };
u16 MediumTime;
} f; // Field
} TSPEC_BODY, *PTSPEC_BODY;
//typedef struct _TCLASS{ //typedef struct _TCLASS{
// TODO // TODO
......
...@@ -19,7 +19,7 @@ struct ts_common_info { ...@@ -19,7 +19,7 @@ struct ts_common_info {
struct timer_list setup_timer; struct timer_list setup_timer;
struct timer_list inact_timer; struct timer_list inact_timer;
u8 addr[6]; u8 addr[6];
TSPEC_BODY t_spec; struct tspec_body t_spec;
QOS_TCLAS t_class[TCLAS_NUM]; QOS_TCLAS t_class[TCLAS_NUM];
u8 t_clas_proc; u8 t_clas_proc;
u8 t_clas_num; u8 t_clas_num;
......
...@@ -104,7 +104,7 @@ static void TsAddBaProcess(struct timer_list *t) ...@@ -104,7 +104,7 @@ static void TsAddBaProcess(struct timer_list *t)
static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo) static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo)
{ {
eth_zero_addr(pTsCommonInfo->addr); 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); memset(&pTsCommonInfo->t_class, 0, sizeof(QOS_TCLAS)*TCLAS_NUM);
pTsCommonInfo->t_clas_proc = 0; pTsCommonInfo->t_clas_proc = 0;
pTsCommonInfo->t_clas_num = 0; pTsCommonInfo->t_clas_num = 0;
...@@ -246,10 +246,10 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee, ...@@ -246,10 +246,10 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee,
if (!search_dir[dir]) if (!search_dir[dir])
continue; continue;
list_for_each_entry(pRet, psearch_list, list){ 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 (memcmp(pRet->addr, Addr, 6) == 0)
if (pRet->t_spec.f.TSInfo.uc_tsid == TID) if (pRet->t_spec.TSInfo.uc_tsid == TID)
if(pRet->t_spec.f.TSInfo.uc_direction == dir) { if(pRet->t_spec.TSInfo.uc_direction == dir) {
// printk("Bingo! got it\n"); // printk("Bingo! got it\n");
break; break;
} }
...@@ -265,7 +265,7 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee, ...@@ -265,7 +265,7 @@ static struct ts_common_info *SearchAdmitTRStream(struct ieee80211_device *ieee,
} }
static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *Addr, 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 TCLAS_Proc)
{ {
u8 count; u8 count;
...@@ -276,7 +276,7 @@ static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *Addr, ...@@ -276,7 +276,7 @@ static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *Addr,
memcpy(pTsCommonInfo->addr, Addr, 6); memcpy(pTsCommonInfo->addr, Addr, 6);
if(pTSPEC != NULL) 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++) for(count = 0; count < TCLAS_Num; count++)
memcpy((u8 *)(&(pTsCommonInfo->t_class[count])), (u8 *)pTCLAS, sizeof(QOS_TCLAS)); memcpy((u8 *)(&(pTsCommonInfo->t_class[count])), (u8 *)pTCLAS, sizeof(QOS_TCLAS));
...@@ -354,8 +354,8 @@ bool GetTs( ...@@ -354,8 +354,8 @@ bool GetTs(
// This is for EDCA and WMM to add a new TS. // This is for EDCA and WMM to add a new TS.
// For HCCA or WMMSA, TS cannot be addmit without negotiation. // For HCCA or WMMSA, TS cannot be addmit without negotiation.
// //
TSPEC_BODY TSpec; struct tspec_body TSpec;
struct qos_tsinfo *pTSInfo = &TSpec.f.TSInfo; struct qos_tsinfo *pTSInfo = &TSpec.TSInfo;
struct list_head *pUnusedList = struct list_head *pUnusedList =
(TxRxSelect == TX_DIR)? (TxRxSelect == TX_DIR)?
(&ieee->Tx_TS_Unused_List): (&ieee->Tx_TS_Unused_List):
......
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