diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-07-19 10:17:01 -0500 |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-24 01:55:03 -0500 |
| commit | f198db0c985ca627f9d068a00f6836c40ef4e737 (patch) | |
| tree | 72a996a30e5ba8fd5c71f89ca82b104a20045086 | |
| parent | 6857f36710863716dc60c49e33769dd694aacda6 (diff) | |
| download | op-kernel-dev-f198db0c985ca627f9d068a00f6836c40ef4e737.zip op-kernel-dev-f198db0c985ca627f9d068a00f6836c40ef4e737.tar.gz | |
staging: rtl8192e: Convert typedef DELBA_PARAM_SET to union delba_param_set
Remove typedef from union.
Rename union.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_BA.h | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_BAProc.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_BA.h b/drivers/staging/rtl8192e/rtl819x_BA.h index 1e2cc2e..d2020b390 100644 --- a/drivers/staging/rtl8192e/rtl819x_BA.h +++ b/drivers/staging/rtl8192e/rtl819x_BA.h @@ -56,7 +56,7 @@ union ba_param_set { } field; }; -typedef union _DELBA_PARAM_SET { +union delba_param_set { u8 charData[2]; u16 shortData; struct { @@ -64,7 +64,7 @@ typedef union _DELBA_PARAM_SET { u16 Initiator:1; u16 TID:4; } field; -} DELBA_PARAM_SET, *PDELBA_PARAM_SET; +}; struct ba_record { struct timer_list Timer; diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 6a5d686..f82d577 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -144,7 +144,7 @@ static struct sk_buff* rtllib_DELBA( u16 ReasonCode ) { - DELBA_PARAM_SET DelbaParamSet; + union delba_param_set DelbaParamSet; struct sk_buff *skb = NULL; struct rtllib_hdr_3addr* Delba = NULL; u8* tag = NULL; @@ -430,7 +430,7 @@ OnADDBARsp_Reject: int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb) { struct rtllib_hdr_3addr* delba = NULL; - PDELBA_PARAM_SET pDelBaParamSet = NULL; + union delba_param_set *pDelBaParamSet = NULL; u16* pReasonCode = NULL; u8* dst = NULL; @@ -452,7 +452,7 @@ int rtllib_rx_DELBA(struct rtllib_device* ieee,struct sk_buff *skb) delba = ( struct rtllib_hdr_3addr*)skb->data; dst = (u8*)(&delba->addr2[0]); delba += sizeof( struct rtllib_hdr_3addr); - pDelBaParamSet = (PDELBA_PARAM_SET)(delba+2); + pDelBaParamSet = (union delba_param_set *)(delba+2); pReasonCode = (u16*)(delba+4); if (pDelBaParamSet->field.Initiator == 1) |
