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 24/37] staging:r8188eu: remove rx_tail member of recv_frame structure
Date: Wed, 19 Oct 2016 22:07:52 +0700 [thread overview]
Message-ID: <1476889685-7367-24-git-send-email-insafonov@gmail.com> (raw)
In-Reply-To: <1476889685-7367-1-git-send-email-insafonov@gmail.com>
rx_end replaced with pkt->tail.
Signed-off-by: Ivan Safonov <insafonov@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_recv.c | 2 +-
drivers/staging/rtl8188eu/include/rtw_recv.h | 3 ---
drivers/staging/rtl8188eu/os_dep/recv_linux.c | 2 +-
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 1 -
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index a210a43..0a520a2 100644
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -1381,7 +1381,7 @@ static struct recv_frame *recvframe_defrag(struct adapter *adapter,
recvframe_pull_tail(prframe, pfhdr->attrib.icv_len);
/* memcpy */
- memcpy(pfhdr->rx_tail, pnfhdr->pkt->data, pnfhdr->len);
+ memcpy(pfhdr->pkt->tail, pnfhdr->pkt->data, pnfhdr->len);
recvframe_put(prframe, pnfhdr->len);
diff --git a/drivers/staging/rtl8188eu/include/rtw_recv.h b/drivers/staging/rtl8188eu/include/rtw_recv.h
index 34d13f8..eab2bef 100644
--- a/drivers/staging/rtl8188eu/include/rtw_recv.h
+++ b/drivers/staging/rtl8188eu/include/rtw_recv.h
@@ -233,7 +233,6 @@ struct recv_frame {
struct adapter *adapter;
struct rx_pkt_attrib attrib;
uint len;
- u8 *rx_tail;
struct sta_info *psta;
/* for A-MPDU Rx reordering buffer control */
struct recv_reorder_ctrl *preorder_ctrl;
@@ -287,7 +286,6 @@ static inline u8 *recvframe_put(struct recv_frame *precvframe, uint sz)
tail = skb_put(precvframe->pkt, sz);
if (!tail)
return NULL;
- precvframe->rx_tail += sz;
precvframe->len += sz;
return tail;
}
@@ -305,7 +303,6 @@ static inline void recvframe_pull_tail(struct recv_frame *precvframe, uint sz)
if (precvframe->len < sz)
return;
- precvframe->rx_tail -= sz;
skb_trim(precvframe->pkt, precvframe->pkt->len - sz);
precvframe->len -= sz;
}
diff --git a/drivers/staging/rtl8188eu/os_dep/recv_linux.c b/drivers/staging/rtl8188eu/os_dep/recv_linux.c
index e405ea9..98b5817 100644
--- a/drivers/staging/rtl8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/recv_linux.c
@@ -95,7 +95,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter,
precv_frame->pkt->data));
RT_TRACE(_module_recv_osdep_c_, _drv_info_,
("precv_frame->hdr.rx_tail =%p precv_frame->pkt->end =%p precv_frame->hdr.len =%d\n",
- precv_frame->rx_tail, precv_frame->pkt->end,
+ precv_frame->pkt->tail, precv_frame->pkt->end,
precv_frame->len));
skb_set_tail_pointer(skb, precv_frame->len);
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
index 45682ac..3fc4d84 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c
@@ -127,7 +127,6 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)
skb_reserve(pkt_copy, 8 - ((size_t)(pkt_copy->data) & 7));/* force pkt_copy->data at 8-byte alignment address */
skb_reserve(pkt_copy, shift_sz);/* force ip_hdr at 8-byte alignment address according to shift_sz. */
memcpy(pkt_copy->data, (pbuf + pattrib->drvinfo_sz + RXDESC_SIZE), skb_len);
- precvframe->rx_tail = pkt_copy->data;
} else {
DBG_88E("recvbuf2recvframe: alloc_skb fail , drop frag frame\n");
rtw_free_recvframe(precvframe, pfree_recv_queue);
--
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 ` Ivan Safonov [this message]
2016-10-19 15:07 ` [PATCH 25/37] staging:r8188eu: remove len member of recv_frame structure 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 ` [PATCH 30/37] staging:r8188eu: remove eth_type member of rx_pkt_attrib structure Ivan Safonov
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-24-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