redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

staging: rtl8192e: Convert typedef frameqos to union frameqos

Browse source 
Remove typedef from union.
Rename union.
Rename uses.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2011-07-19 10:37:34 -05:00
parent eb85e46896
commit 66ba443abf
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/rtl8192e/rtllib.h
View file

@ -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;
}

2
drivers/staging/rtl8192e/rtllib_rx.c
View file

@ -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;
}