diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-07-19 10:11:23 -0500 |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-24 01:53:58 -0500 |
| commit | 7baf9546daf78de5760bf0b120b1da39ace855b1 (patch) | |
| tree | 87d63f5be3bef9cb8f6a7f2c13c6da1d7a62e9cf | |
| parent | edc4b2c5708547de030ff73ffc771ad498209206 (diff) | |
| download | op-kernel-dev-7baf9546daf78de5760bf0b120b1da39ace855b1.zip op-kernel-dev-7baf9546daf78de5760bf0b120b1da39ace855b1.tar.gz | |
staging: rtl8192e: Convert typedef SEQUENCE_CONTROL to union sequence_control
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 | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl819x_BAProc.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/rtl8192e/rtl819x_BA.h b/drivers/staging/rtl8192e/rtl819x_BA.h index a0c46c5..a868d65 100644 --- a/drivers/staging/rtl8192e/rtl819x_BA.h +++ b/drivers/staging/rtl8192e/rtl819x_BA.h @@ -36,14 +36,14 @@ #define DELBA_REASON_END_BA 37 #define DELBA_REASON_UNKNOWN_BA 38 #define DELBA_REASON_TIMEOUT 39 -typedef union _SEQUENCE_CONTROL{ +union sequence_control { u16 ShortData; struct { u16 FragNum:4; u16 SeqNum:12; }field; -}SEQUENCE_CONTROL, *PSEQUENCE_CONTROL; +}; typedef union _BA_PARAM_SET { u8 charData[2]; @@ -72,7 +72,7 @@ struct ba_record { u8 DialogToken; BA_PARAM_SET BaParamSet; u16 BaTimeoutValue; - SEQUENCE_CONTROL BaStartSeqCtrl; + union sequence_control BaStartSeqCtrl; }; #endif diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index f721d28..608ea2d 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -243,7 +243,7 @@ int rtllib_rx_ADDBAReq( struct rtllib_device* ieee, struct sk_buff *skb) struct ba_record *pBA = NULL; PBA_PARAM_SET pBaParamSet = NULL; u16* pBaTimeoutVal = NULL; - PSEQUENCE_CONTROL pBaStartSeqCtrl = NULL; + union sequence_control *pBaStartSeqCtrl = NULL; struct rx_ts_record *pTS = NULL; 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; pBaParamSet = (PBA_PARAM_SET)(tag + 3); 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)); if (ieee->current_network.qos_data.active == 0 || |
