diff options
author | Ivan Safonov <insafonov@gmail.com> | 2016-09-18 13:24:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-20 07:33:48 -0400 |
commit | 111e4e5ac225a2b517994ae499fde729c7e4c551 (patch) | |
tree | 42c4f58c15c179b7feafd26b4d6b9a72b1d955a0 /drivers/staging | |
parent | bc9886d32e631edf6db67feee195e6eed1a21786 (diff) |
staging: r8188eu: remove pkt_hdrlen member of pkt_attrib structure
pkt_hdrlen has a constant value.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/rtl8188eu/core/rtw_xmit.c | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8188eu/include/rtw_xmit.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c index be7fe742a1bf..e028ff4a52ef 100644 --- a/drivers/staging/rtl8188eu/core/rtw_xmit.c +++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c | |||
@@ -511,8 +511,6 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p | |||
511 | } | 511 | } |
512 | 512 | ||
513 | pattrib->ack_policy = 0; | 513 | pattrib->ack_policy = 0; |
514 | /* get ether_hdr_len */ | ||
515 | pattrib->pkt_hdrlen = ETH_HLEN;/* pattrib->ether_type == 0x8100) ? (14 + 4): 14; vlan tag */ | ||
516 | 514 | ||
517 | pattrib->hdrlen = WLAN_HDR_A3_LEN; | 515 | pattrib->hdrlen = WLAN_HDR_A3_LEN; |
518 | pattrib->subtype = WIFI_DATA_TYPE; | 516 | pattrib->subtype = WIFI_DATA_TYPE; |
@@ -995,7 +993,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct | |||
995 | } | 993 | } |
996 | 994 | ||
997 | _rtw_open_pktfile(pkt, &pktfile); | 995 | _rtw_open_pktfile(pkt, &pktfile); |
998 | _rtw_pktfile_read(&pktfile, NULL, pattrib->pkt_hdrlen); | 996 | _rtw_pktfile_read(&pktfile, NULL, ETH_HLEN); |
999 | 997 | ||
1000 | frg_inx = 0; | 998 | frg_inx = 0; |
1001 | frg_len = pxmitpriv->frag_len - 4;/* 2346-4 = 2342 */ | 999 | frg_len = pxmitpriv->frag_len - 4;/* 2346-4 = 2342 */ |
diff --git a/drivers/staging/rtl8188eu/include/rtw_xmit.h b/drivers/staging/rtl8188eu/include/rtw_xmit.h index cb49aca0adce..dd6b7a9a8d4a 100644 --- a/drivers/staging/rtl8188eu/include/rtw_xmit.h +++ b/drivers/staging/rtl8188eu/include/rtw_xmit.h | |||
@@ -113,7 +113,6 @@ struct pkt_attrib { | |||
113 | u8 dhcp_pkt; | 113 | u8 dhcp_pkt; |
114 | u16 ether_type; | 114 | u16 ether_type; |
115 | u16 seqnum; | 115 | u16 seqnum; |
116 | u16 pkt_hdrlen; /* the original 802.3 pkt header len */ | ||
117 | u16 hdrlen; /* the WLAN Header Len */ | 116 | u16 hdrlen; /* the WLAN Header Len */ |
118 | u32 pktlen; /* the original 802.3 pkt raw_data len (not include | 117 | u32 pktlen; /* the original 802.3 pkt raw_data len (not include |
119 | * ether_hdr data) */ | 118 | * ether_hdr data) */ |