Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S944252AbcJSPGO (ORCPT ); Wed, 19 Oct 2016 11:06:14 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:34867 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S943907AbcJSPGK (ORCPT ); Wed, 19 Oct 2016 11:06:10 -0400 From: Ivan Safonov To: Greg Kroah-Hartman , Bhaktipriya Shridhar , Andy Shevchenko , Geliang Tang , 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 Message-Id: <1476889685-7367-24-git-send-email-insafonov@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1476889685-7367-1-git-send-email-insafonov@gmail.com> References: <1476889685-7367-1-git-send-email-insafonov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3373 Lines: 78 rx_end replaced with pkt->tail. Signed-off-by: Ivan Safonov --- 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