[PATCH 084/166] staging: rtl8192e: Convert typedef frameqos to union frameqos
Larry Finger
Larry.Finger at lwfinger.net
Thu Aug 25 04:48:31 UTC 2011
Remove typedef from union.
Rename union.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
---
drivers/staging/rtl8192e/rtllib.h | 6 +++---
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 08b6770..aadaa95 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 68f4aee..ee05d76 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;
}
--
1.7.3.4
More information about the devel
mailing list