diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-07-19 10:37:34 -0500 |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-24 02:00:18 -0500 |
| commit | 66ba443abf111ab8e8df86e6eb0fb8d87fd5dc21 (patch) | |
| tree | 193f6089aad4b18141b5f327914dd537553dd672 /drivers | |
| parent | eb85e4689631ce116b74a87ce8929d07ba9b7601 (diff) | |
staging: rtl8192e: Convert typedef frameqos to union frameqos
Remove typedef from union.
Rename union.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib.h | 6 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtllib_rx.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 08b6770dca6a..aadaa951685c 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1351,7 +1351,7 @@ struct rtllib_rxb { u8 src[ETH_ALEN]; }__attribute__((packed)); -typedef union _frameqos { +union frameqos { u16 shortdata; u8 chardata[2]; struct { @@ -1361,7 +1361,7 @@ typedef union _frameqos { u16 reserved:1; u16 txop:8; }field; -}frameqos,*pframeqos; +}; /* SWEEP TABLE ENTRIES NUMBER*/ #define MAX_SWEEP_TAB_ENTRIES 42 @@ -1511,7 +1511,7 @@ static inline u8 Frame_QoSTID(u8* buf) u16 fc; hdr = (struct rtllib_hdr_3addr *)buf; fc = le16_to_cpu(hdr->frame_ctl); - return (u8)((frameqos*)(buf + (((fc & RTLLIB_FCTL_TODS)&&(fc & RTLLIB_FCTL_FROMDS))? 30 : 24)))->field.tid; + return (u8)((union frameqos *)(buf + (((fc & RTLLIB_FCTL_TODS)&&(fc & RTLLIB_FCTL_FROMDS))? 30 : 24)))->field.tid; } diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index 68f4aeed9e56..ee05d7685f92 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -748,7 +748,7 @@ u8 parse_subframe(struct rtllib_device* ieee,struct sk_buff *skb, /* just for debug purpose */ SeqNum = WLAN_GET_SEQ_SEQ(le16_to_cpu(hdr->seq_ctl)); if ((RTLLIB_QOS_HAS_SEQ(fc))&&\ - (((frameqos *)(skb->data + RTLLIB_3ADDR_LEN))->field.reserved)) { + (((union frameqos *)(skb->data + RTLLIB_3ADDR_LEN))->field.reserved)) { bIsAggregateFrame = true; } |