Commit 6857f367 authored by Larry Finger's avatar Larry Finger

staging: rtl8192e: Convert typedef BA_PARAM_SET to union ba_param_set

Remove typedef from union.
Rename union.
Rename uses.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 7baf9546
...@@ -45,7 +45,7 @@ union sequence_control { ...@@ -45,7 +45,7 @@ union sequence_control {
}field; }field;
}; };
typedef union _BA_PARAM_SET { union ba_param_set {
u8 charData[2]; u8 charData[2];
u16 shortData; u16 shortData;
struct { struct {
...@@ -54,7 +54,7 @@ typedef union _BA_PARAM_SET { ...@@ -54,7 +54,7 @@ typedef union _BA_PARAM_SET {
u16 TID:4; u16 TID:4;
u16 BufferSize:10; u16 BufferSize:10;
} field; } field;
} BA_PARAM_SET, *PBA_PARAM_SET; };
typedef union _DELBA_PARAM_SET { typedef union _DELBA_PARAM_SET {
u8 charData[2]; u8 charData[2];
...@@ -70,7 +70,7 @@ struct ba_record { ...@@ -70,7 +70,7 @@ struct ba_record {
struct timer_list Timer; struct timer_list Timer;
u8 bValid; u8 bValid;
u8 DialogToken; u8 DialogToken;
BA_PARAM_SET BaParamSet; union ba_param_set BaParamSet;
u16 BaTimeoutValue; u16 BaTimeoutValue;
union sequence_control BaStartSeqCtrl; union sequence_control BaStartSeqCtrl;
}; };
......
...@@ -241,7 +241,7 @@ int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb) ...@@ -241,7 +241,7 @@ int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb)
u16 rc = 0; u16 rc = 0;
u8 * dst = NULL, *pDialogToken = NULL, *tag = NULL; u8 * dst = NULL, *pDialogToken = NULL, *tag = NULL;
struct ba_record *pBA = NULL; struct ba_record *pBA = NULL;
PBA_PARAM_SET pBaParamSet = NULL; union ba_param_set *pBaParamSet = NULL;
u16* pBaTimeoutVal = NULL; u16* pBaTimeoutVal = NULL;
union sequence_control *pBaStartSeqCtrl = NULL; union sequence_control *pBaStartSeqCtrl = NULL;
struct rx_ts_record *pTS = NULL; struct rx_ts_record *pTS = NULL;
...@@ -259,7 +259,7 @@ int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb) ...@@ -259,7 +259,7 @@ int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb)
dst = (u8*)(&req->addr2[0]); dst = (u8*)(&req->addr2[0]);
tag += sizeof( struct rtllib_hdr_3addr); tag += sizeof( struct rtllib_hdr_3addr);
pDialogToken = tag + 2; pDialogToken = tag + 2;
pBaParamSet = (PBA_PARAM_SET)(tag + 3); pBaParamSet = (union ba_param_set *)(tag + 3);
pBaTimeoutVal = (u16*)(tag + 5); pBaTimeoutVal = (u16*)(tag + 5);
pBaStartSeqCtrl = (union sequence_control *)(req + 7); pBaStartSeqCtrl = (union sequence_control *)(req + 7);
...@@ -332,7 +332,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb) ...@@ -332,7 +332,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb)
struct tx_ts_record *pTS = NULL; struct tx_ts_record *pTS = NULL;
u8* dst = NULL, *pDialogToken = NULL, *tag = NULL; u8* dst = NULL, *pDialogToken = NULL, *tag = NULL;
u16* pStatusCode = NULL, *pBaTimeoutVal = NULL; u16* pStatusCode = NULL, *pBaTimeoutVal = NULL;
PBA_PARAM_SET pBaParamSet = NULL; union ba_param_set *pBaParamSet = NULL;
u16 ReasonCode; u16 ReasonCode;
if (skb->len < sizeof( struct rtllib_hdr_3addr) + 9) if (skb->len < sizeof( struct rtllib_hdr_3addr) + 9)
...@@ -346,7 +346,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb) ...@@ -346,7 +346,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb)
tag += sizeof( struct rtllib_hdr_3addr); tag += sizeof( struct rtllib_hdr_3addr);
pDialogToken = tag + 2; pDialogToken = tag + 2;
pStatusCode = (u16*)(tag + 3); pStatusCode = (u16*)(tag + 3);
pBaParamSet = (PBA_PARAM_SET)(tag + 5); pBaParamSet = (union ba_param_set *)(tag + 5);
pBaTimeoutVal = (u16*)(tag + 7); pBaTimeoutVal = (u16*)(tag + 7);
RT_TRACE(COMP_DBG, "====>rx ADDBARSP from :"MAC_FMT"\n", MAC_ARG(dst)); RT_TRACE(COMP_DBG, "====>rx ADDBARSP from :"MAC_FMT"\n", MAC_ARG(dst));
......
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