From: Ivan Safonov <insafonov@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Bhaktipriya Shridhar <bhaktipriya96@gmail.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Geliang Tang <geliangtang@163.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Cc: insafonov@gmail.com
Subject: [PATCH 30/37] staging:r8188eu: remove eth_type member of rx_pkt_attrib structure
Date: Wed, 19 Oct 2016 22:07:58 +0700 [thread overview]
Message-ID: <1476889685-7367-30-git-send-email-insafonov@gmail.com> (raw)
In-Reply-To: <1476889685-7367-1-git-send-email-insafonov@gmail.com>
Prepare to replacing wlanhdr_to_ethhdr by ieee80211_data_to_8023.
Calculate it locally.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_recv.c | 26 ++++++++++++++++++++------
drivers/staging/rtl8188eu/include/rtw_recv.h | 2 --
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index 630d9eb..2de4289 100644
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -1267,7 +1267,7 @@ static int validate_recv_frame(struct adapter *adapter,
static int wlanhdr_to_ethhdr(struct recv_frame *precvframe)
{
int rmv_len;
- u16 eth_type, len;
+ u16 len;
__be16 be_tmp;
u8 bsnaphdr;
u8 *psnap_type;
@@ -1296,10 +1296,6 @@ static int wlanhdr_to_ethhdr(struct recv_frame *precvframe)
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
("\n===pattrib->hdrlen: %x===\n\n", pattrib->hdrlen));
- memcpy(&be_tmp, ptr+rmv_len, 2);
- eth_type = ntohs(be_tmp); /* pattrib->ether_type */
- pattrib->eth_type = eth_type;
-
ptr = skb_pull(precvframe->pkt, (rmv_len-sizeof(struct ethhdr) + (bsnaphdr ? 2 : 0)));
memcpy(ptr, pattrib->dst, ETH_ALEN);
@@ -1745,14 +1741,32 @@ static int recv_indicatepkt_reorder(struct adapter *padapter,
struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
if (!pattrib->amsdu) {
+ u16 eth_type;
+ u8 *ptr = prframe->pkt->data;
+ u8 *psnap_type;
+ int eth_type_offset;
+ struct ieee80211_snap_hdr *psnap;
+
/* s1. */
strip_iv_icv(prframe->pkt, prframe->attrib.hdrlen,
prframe->attrib.iv_len,
prframe->attrib.encrypt ? prframe->attrib.icv_len : 0);
+ psnap = (struct ieee80211_snap_hdr *)(ptr + pattrib->hdrlen);
+ psnap_type = ptr + pattrib->hdrlen + SNAP_SIZE;
+ eth_type_offset = pattrib->hdrlen;
+
+ if ((!memcmp(psnap, rtw_rfc1042_header, SNAP_SIZE) &&
+ (!memcmp(psnap_type, SNAP_ETH_TYPE_IPX, 2) == false) &&
+ (!memcmp(psnap_type, SNAP_ETH_TYPE_APPLETALK_AARP, 2) == false)) ||
+ !memcmp(psnap, rtw_bridge_tunnel_header, SNAP_SIZE))
+ eth_type_offset += SNAP_SIZE;
+
+ eth_type = ntohs(*(__be16 *)(ptr + eth_type_offset));
+
wlanhdr_to_ethhdr(prframe);
- if ((pattrib->qos != 1) || (pattrib->eth_type == 0x0806) ||
+ if ((pattrib->qos != 1) || eth_type == 0x0806 ||
(pattrib->ack_policy != 0)) {
if ((!padapter->bDriverStopped) &&
(!padapter->bSurpriseRemoved)) {
diff --git a/drivers/staging/rtl8188eu/include/rtw_recv.h b/drivers/staging/rtl8188eu/include/rtw_recv.h
index 748c014e..b86ec85 100644
--- a/drivers/staging/rtl8188eu/include/rtw_recv.h
+++ b/drivers/staging/rtl8188eu/include/rtw_recv.h
@@ -112,8 +112,6 @@ struct rx_pkt_attrib {
u8 crc_err;
u8 icv_err;
- u16 eth_type;
-
u8 dst[ETH_ALEN];
u8 src[ETH_ALEN];
u8 ta[ETH_ALEN];
--
2.7.3
next prev parent reply other threads:[~2016-10-19 15:06 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-19 15:07 [PATCH 01/37] staging:r8188eu: remove get_rxmem function Ivan Safonov
2016-10-19 15:07 ` [PATCH 02/37] staging:r8188eu: remove device assignment after netdev_alloc_skb call Ivan Safonov
2016-10-19 16:53 ` Andy Shevchenko
2016-10-19 16:59 ` Andy Shevchenko
2016-10-20 12:16 ` Ivan Safonov
2016-10-25 8:51 ` Greg Kroah-Hartman
2016-10-20 8:46 ` Dan Carpenter
2016-10-19 15:07 ` [PATCH 03/37] staging:r8188eu: remove skb cloning after netdev_alloc_skb fail Ivan Safonov
2016-10-20 8:43 ` Dan Carpenter
2016-10-19 15:07 ` [PATCH 04/37] staging:r8188eu: remove WIFI_MP_* definitions and all corresponding code Ivan Safonov
2016-10-19 15:07 ` [PATCH 05/37] staging:r8188eu: remove mp_mode member of odm_dm_struct and odm_dm_struct structures Ivan Safonov
2016-10-19 15:07 ` [PATCH 06/37] staging:r8188eu: refactor rtl88eu_phy_iq_calibrate function Ivan Safonov
2016-10-19 15:07 ` [PATCH 07/37] staging:r8188eu: remove is2t argument if the phy_iq_calibrate function Ivan Safonov
2016-10-19 15:07 ` [PATCH 08/37] staging:r8188eu: refactor path_adda_on function Ivan Safonov
2016-10-19 15:07 ` [PATCH 09/37] staging:r8188eu: remove is2t argument of phy_lc_calibrate function Ivan Safonov
2016-10-19 15:07 ` [PATCH 10/37] staging:r8188eu: remove type cast for first argument of memset Ivan Safonov
2016-10-19 15:07 ` [PATCH 11/37] staging:r8188eu: remove is_(multicast|broadcast)_mac_addr Ivan Safonov
2016-10-19 15:07 ` [PATCH 12/37] staging:r8188eu: remove ieee80211_get_hdrlen function Ivan Safonov
2016-10-19 15:07 ` [PATCH 13/37] staging:r8188eu: remove debug messages after memory allocation failed Ivan Safonov
2016-10-25 9:11 ` Dan Carpenter
2016-10-19 15:07 ` [PATCH 14/37] staging:r8188eu: remove ieee80211_is_empty_essid function Ivan Safonov
2016-10-19 15:07 ` [PATCH 15/37] staging:r8188eu: remove rx_head member of recv_frame structure Ivan Safonov
2016-10-19 15:07 ` [PATCH 16/37] staging:r8188eu: change recvframe_pull last argument type Ivan Safonov
2016-10-19 15:07 ` [PATCH 17/37] staging:r8188eu: update pkt->data synchronously with rx_data Ivan Safonov
2016-10-20 9:03 ` Dan Carpenter
2016-10-20 13:15 ` Ivan Safonov
2016-10-19 15:07 ` [PATCH 18/37] staging:r8188eu: remove rx_data member of recv_frame structure Ivan Safonov
2016-10-19 15:07 ` [PATCH 19/37] staging:r8188eu: remove rx_end " Ivan Safonov
2016-10-19 15:07 ` [PATCH 20/37] staging:r8188eu: change recvframe_put last argument type Ivan Safonov
2016-10-19 15:07 ` [PATCH 21/37] staging:r8188eu: change recvframe_pull_tail " Ivan Safonov
2016-10-19 15:07 ` [PATCH 22/37] staging:r8188eu: change recvframe_pull_tail type to void Ivan Safonov
2016-10-19 15:07 ` [PATCH 23/37] staging:r8188eu: update rx_tail and pkt->tail synchronously Ivan Safonov
2016-10-19 15:07 ` [PATCH 24/37] staging:r8188eu: remove rx_tail member of recv_frame structure Ivan Safonov
2016-10-19 15:07 ` [PATCH 25/37] staging:r8188eu: remove len " Ivan Safonov
2016-10-19 15:07 ` [PATCH 26/37] staging:r8188eu: remove recvframe_pull function Ivan Safonov
2016-10-19 15:07 ` [PATCH 27/37] staging:r8188eu: remove recvframe_put function Ivan Safonov
2016-10-19 15:07 ` [PATCH 28/37] staging:r8188eu: remove recvframe_pull_tail function Ivan Safonov
2016-10-19 15:07 ` [PATCH 29/37] staging:r8188eu: take out stripping of iv and icv space from wlanhdr_to_ethhdr function Ivan Safonov
2016-10-20 9:11 ` Dan Carpenter
2016-10-19 15:07 ` Ivan Safonov [this message]
2016-10-19 15:07 ` [PATCH 31/37] staging:r8188eu: remove pscanned member of mlme_priv structure Ivan Safonov
2016-10-19 15:08 ` [PATCH 32/37] staging:r8188eu: remove SET_EARLYMODE_* definitions Ivan Safonov
2016-10-19 15:08 ` [PATCH 33/37] staging:r8188eu: remove rtw_calculate_wlan_pkt_size_by_attribue function Ivan Safonov
2016-10-19 15:08 ` [PATCH 34/37] staging:r8188eu: remove update_bcn member of mlme_priv structure Ivan Safonov
2016-10-19 15:08 ` [PATCH 35/37] staging:r8188eu: remove clr_fwstate* functions Ivan Safonov
2016-10-19 15:08 ` [PATCH 36/37] staging:r8188eu: remove unused structures from include/rtw_mlme.h Ivan Safonov
2016-10-19 15:08 ` [PATCH 37/37] staging:r8188eu: remove P2P_* enumerations Ivan Safonov
2016-10-20 9:18 ` [PATCH 01/37] staging:r8188eu: remove get_rxmem function Dan Carpenter
2016-10-20 13:56 ` Ivan Safonov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476889685-7367-30-git-send-email-insafonov@gmail.com \
--to=insafonov@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bhaktipriya96@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=geliangtang@163.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome