Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S944588AbcJSPR1 (ORCPT ); Wed, 19 Oct 2016 11:17:27 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:35964 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S944222AbcJSPGJ (ORCPT ); Wed, 19 Oct 2016 11:06:09 -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 19/37] staging:r8188eu: remove rx_end member of recv_frame structure Date: Wed, 19 Oct 2016 22:07:47 +0700 Message-Id: <1476889685-7367-19-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: 2673 Lines: 59 rx_end replaced with pkt->end. Signed-off-by: Ivan Safonov --- drivers/staging/rtl8188eu/include/rtw_recv.h | 3 +-- drivers/staging/rtl8188eu/os_dep/recv_linux.c | 4 ++-- drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8188eu/include/rtw_recv.h b/drivers/staging/rtl8188eu/include/rtw_recv.h index e6cc3af..ee0d9a56 100644 --- a/drivers/staging/rtl8188eu/include/rtw_recv.h +++ b/drivers/staging/rtl8188eu/include/rtw_recv.h @@ -234,7 +234,6 @@ struct recv_frame { struct rx_pkt_attrib attrib; uint len; u8 *rx_tail; - u8 *rx_end; struct sta_info *psta; /* for A-MPDU Rx reordering buffer control */ struct recv_reorder_ctrl *preorder_ctrl; @@ -285,7 +284,7 @@ static inline u8 *recvframe_put(struct recv_frame *precvframe, int sz) precvframe->rx_tail += sz; - if (precvframe->rx_tail > precvframe->rx_end) { + if (precvframe->rx_tail > precvframe->pkt->end) { precvframe->rx_tail -= sz; return NULL; } diff --git a/drivers/staging/rtl8188eu/os_dep/recv_linux.c b/drivers/staging/rtl8188eu/os_dep/recv_linux.c index 3c41c5e..e405ea9 100644 --- a/drivers/staging/rtl8188eu/os_dep/recv_linux.c +++ b/drivers/staging/rtl8188eu/os_dep/recv_linux.c @@ -94,8 +94,8 @@ int rtw_recv_indicatepkt(struct adapter *padapter, ("rtw_recv_indicatepkt(): precv_frame->pkt->rx_data =%p\n", precv_frame->pkt->data)); RT_TRACE(_module_recv_osdep_c_, _drv_info_, - ("precv_frame->hdr.rx_tail =%p precv_frame->rx_end =%p precv_frame->hdr.len =%d\n", - precv_frame->rx_tail, precv_frame->rx_end, + ("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->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 8ed42e3..45682ac 100644 --- a/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c +++ b/drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c @@ -124,7 +124,6 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb) pkt_copy = netdev_alloc_skb(adapt->pnetdev, alloc_sz); if (pkt_copy) { precvframe->pkt = pkt_copy; - precvframe->rx_end = pkt_copy->data + alloc_sz; 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); -- 2.7.3