Commit 66ba443a authored by Larry Finger's avatar Larry Finger

staging: rtl8192e: Convert typedef frameqos to union frameqos

Remove typedef from union.
Rename union.
Rename uses.
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
parent eb85e468
...@@ -1351,7 +1351,7 @@ struct rtllib_rxb { ...@@ -1351,7 +1351,7 @@ struct rtllib_rxb {
u8 src[ETH_ALEN]; u8 src[ETH_ALEN];
}__attribute__((packed)); }__attribute__((packed));
typedef union _frameqos { union frameqos {
u16 shortdata; u16 shortdata;
u8 chardata[2]; u8 chardata[2];
struct { struct {
...@@ -1361,7 +1361,7 @@ typedef union _frameqos { ...@@ -1361,7 +1361,7 @@ typedef union _frameqos {
u16 reserved:1; u16 reserved:1;
u16 txop:8; u16 txop:8;
}field; }field;
}frameqos,*pframeqos; };
/* SWEEP TABLE ENTRIES NUMBER*/ /* SWEEP TABLE ENTRIES NUMBER*/
#define MAX_SWEEP_TAB_ENTRIES 42 #define MAX_SWEEP_TAB_ENTRIES 42
...@@ -1511,7 +1511,7 @@ static inline u8 Frame_QoSTID(u8* buf) ...@@ -1511,7 +1511,7 @@ static inline u8 Frame_QoSTID(u8* buf)
u16 fc; u16 fc;
hdr = (struct rtllib_hdr_3addr *)buf; hdr = (struct rtllib_hdr_3addr *)buf;
fc = le16_to_cpu(hdr->frame_ctl); 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;
} }
......
...@@ -748,7 +748,7 @@ u8 parse_subframe(struct rtllib_device* ieee,struct sk_buff *skb, ...@@ -748,7 +748,7 @@ u8 parse_subframe(struct rtllib_device* ieee,struct sk_buff *skb,
/* just for debug purpose */ /* just for debug purpose */
SeqNum = WLAN_GET_SEQ_SEQ(le16_to_cpu(hdr->seq_ctl)); SeqNum = WLAN_GET_SEQ_SEQ(le16_to_cpu(hdr->seq_ctl));
if ((RTLLIB_QOS_HAS_SEQ(fc))&&\ 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; bIsAggregateFrame = true;
} }
......
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