Commit f198db0c authored by Larry Finger's avatar Larry Finger

staging: rtl8192e: Convert typedef DELBA_PARAM_SET to union delba_param_set

Remove typedef from union.
Rename union.
Rename uses.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent 6857f367
...@@ -56,7 +56,7 @@ union ba_param_set { ...@@ -56,7 +56,7 @@ union ba_param_set {
} field; } field;
}; };
typedef union _DELBA_PARAM_SET { union delba_param_set {
u8 charData[2]; u8 charData[2];
u16 shortData; u16 shortData;
struct { struct {
...@@ -64,7 +64,7 @@ typedef union _DELBA_PARAM_SET { ...@@ -64,7 +64,7 @@ typedef union _DELBA_PARAM_SET {
u16 Initiator:1; u16 Initiator:1;
u16 TID:4; u16 TID:4;
} field; } field;
} DELBA_PARAM_SET, *PDELBA_PARAM_SET; };
struct ba_record { struct ba_record {
struct timer_list Timer; struct timer_list Timer;
......
...@@ -144,7 +144,7 @@ static struct sk_buff* rtllib_DELBA( ...@@ -144,7 +144,7 @@ static struct sk_buff* rtllib_DELBA(
u16 ReasonCode u16 ReasonCode
) )
{ {
DELBA_PARAM_SET DelbaParamSet; union delba_param_set DelbaParamSet;
struct sk_buff *skb = NULL; struct sk_buff *skb = NULL;
struct rtllib_hdr_3addr* Delba = NULL; struct rtllib_hdr_3addr* Delba = NULL;
u8* tag = NULL; u8* tag = NULL;
...@@ -430,7 +430,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb) ...@@ -430,7 +430,7 @@ int rtllib_rx_ADDBARsp( struct rtllib_device* ieee, struct sk_buff *skb)
int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb) int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
{ {
struct rtllib_hdr_3addr* delba = NULL; struct rtllib_hdr_3addr* delba = NULL;
PDELBA_PARAM_SET pDelBaParamSet = NULL; union delba_param_set *pDelBaParamSet = NULL;
u16* pReasonCode = NULL; u16* pReasonCode = NULL;
u8* dst = NULL; u8* dst = NULL;
...@@ -452,7 +452,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb) ...@@ -452,7 +452,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb)
delba = ( struct rtllib_hdr_3addr*)skb->data; delba = ( struct rtllib_hdr_3addr*)skb->data;
dst = (u8*)(&delba->addr2[0]); dst = (u8*)(&delba->addr2[0]);
delba += sizeof( struct rtllib_hdr_3addr); delba += sizeof( struct rtllib_hdr_3addr);
pDelBaParamSet = (PDELBA_PARAM_SET)(delba+2); pDelBaParamSet = (union delba_param_set *)(delba+2);
pReasonCode = (u16*)(delba+4); pReasonCode = (u16*)(delba+4);
if (pDelBaParamSet->field.Initiator == 1) if (pDelBaParamSet->field.Initiator == 1)
......
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