lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: rtl8192e: Convert typedef SEQUENCE_CONTROL to union sequence_control

Browse Source 
Remove typedef from union.
Rename union.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger
2011-07-19 10:11:23 -05:00
parent edc4b2c570
commit 7baf9546da
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/rtl8192e/rtl819x_BA.h
View File

@@ -36,14 +36,14 @@
#define DELBA_REASON_END_BA 37 #define DELBA_REASON_END_BA 37
#define DELBA_REASON_UNKNOWN_BA 38 #define DELBA_REASON_UNKNOWN_BA 38
#define DELBA_REASON_TIMEOUT 39 #define DELBA_REASON_TIMEOUT 39
typedef union _SEQUENCE_CONTROL{ union sequence_control {
u16 ShortData; u16 ShortData;
struct struct
{ {
u16 FragNum:4; u16 FragNum:4;
u16 SeqNum:12; u16 SeqNum:12;
}field; }field;
}SEQUENCE_CONTROL, *PSEQUENCE_CONTROL; };
typedef union _BA_PARAM_SET { typedef union _BA_PARAM_SET {
u8 charData[2]; u8 charData[2];
@@ -72,7 +72,7 @@ struct ba_record {
u8 DialogToken; u8 DialogToken;
BA_PARAM_SET BaParamSet; BA_PARAM_SET BaParamSet;
u16 BaTimeoutValue; u16 BaTimeoutValue;
SEQUENCE_CONTROL BaStartSeqCtrl; union sequence_control BaStartSeqCtrl;
}; };
#endif #endif

4
drivers/staging/rtl8192e/rtl819x_BAProc.c
View File

@@ -243,7 +243,7 @@ int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb)
struct ba_record *pBA = NULL; struct ba_record *pBA = NULL;
PBA_PARAM_SET pBaParamSet = NULL; PBA_PARAM_SET pBaParamSet = NULL;
u16* pBaTimeoutVal = NULL; u16* pBaTimeoutVal = NULL;
PSEQUENCE_CONTROL pBaStartSeqCtrl = NULL; union sequence_control *pBaStartSeqCtrl = NULL;
struct rx_ts_record *pTS = NULL; struct rx_ts_record *pTS = NULL;
if (skb->len < sizeof( struct rtllib_hdr_3addr) + 9) if (skb->len < sizeof( struct rtllib_hdr_3addr) + 9)
@@ -261,7 +261,7 @@ int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb)
pDialogToken = tag + 2; pDialogToken = tag + 2;
pBaParamSet = (PBA_PARAM_SET)(tag + 3); pBaParamSet = (PBA_PARAM_SET)(tag + 3);
pBaTimeoutVal = (u16*)(tag + 5); pBaTimeoutVal = (u16*)(tag + 5);
pBaStartSeqCtrl = (PSEQUENCE_CONTROL)(req + 7); pBaStartSeqCtrl = (union sequence_control *)(req + 7);
RT_TRACE(COMP_DBG, "====>rx ADDBAREQ from :"MAC_FMT"\n", MAC_ARG(dst)); RT_TRACE(COMP_DBG, "====>rx ADDBAREQ from :"MAC_FMT"\n", MAC_ARG(dst));
if (ieee->current_network.qos_data.active == 0 || if (ieee->current_network.qos_data.active == 0 ||