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>

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 08b6770dca6a88d28573e9edfce39ea020aea03d..aadaa951685c5a52819041cb0df9b9484b035dda 100644 (file)
--- 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 68f4aeed9e561280d0be7c9907db55b268fde094..ee05d7685f920235470b296a5ee455923d7e226c 100644 (file)
--- 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;
        }