OSDN Git Service

staging: r8188eu: remove pkt_hdrlen member of pkt_attrib structure
authorIvan Safonov <insafonov@gmail.com>
Sun, 18 Sep 2016 17:24:54 +0000 (00:24 +0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Sep 2016 11:33:48 +0000 (13:33 +0200)
pkt_hdrlen has a constant value.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/core/rtw_xmit.c
drivers/staging/rtl8188eu/include/rtw_xmit.h

index be7fe74..e028ff4 100644 (file)
@@ -511,8 +511,6 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
        }
 
        pattrib->ack_policy = 0;
-       /*  get ether_hdr_len */
-       pattrib->pkt_hdrlen = ETH_HLEN;/* pattrib->ether_type == 0x8100) ? (14 + 4): 14; vlan tag */
 
        pattrib->hdrlen = WLAN_HDR_A3_LEN;
        pattrib->subtype = WIFI_DATA_TYPE;
@@ -995,7 +993,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
        }
 
        _rtw_open_pktfile(pkt, &pktfile);
-       _rtw_pktfile_read(&pktfile, NULL, pattrib->pkt_hdrlen);
+       _rtw_pktfile_read(&pktfile, NULL, ETH_HLEN);
 
        frg_inx = 0;
        frg_len = pxmitpriv->frag_len - 4;/* 2346-4 = 2342 */
index cb49aca..dd6b7a9 100644 (file)
@@ -113,7 +113,6 @@ struct pkt_attrib {
        u8      dhcp_pkt;
        u16     ether_type;
        u16     seqnum;
-       u16     pkt_hdrlen;     /* the original 802.3 pkt header len */
        u16     hdrlen;         /* the WLAN Header Len */
        u32     pktlen;         /* the original 802.3 pkt raw_data len (not include
                                 * ether_hdr data) */