From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751920AbdBFRV3 (ORCPT ); Mon, 6 Feb 2017 12:21:29 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:35587 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751573AbdBFRVX (ORCPT ); Mon, 6 Feb 2017 12:21:23 -0500 From: Ivan Safonov To: Greg Kroah-Hartman Cc: Ivan Safonov , Luca Ceresoli , William Blough , Kyle Kuffermann , "David S. Miller" , Jarod Wilson , Phil Sutter , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] staging:r8188eu: update pkt->(data|tail|len) synchronously with rx_(data|tail|len) in recv_frame structure Date: Mon, 6 Feb 2017 20:23:27 +0300 Message-Id: <20170206172328.24674-3-insafonov@gmail.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170206172328.24674-1-insafonov@gmail.com> References: <20170206172328.24674-1-insafonov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Original driver code uses rx_* members to store skb (pkt) fields (instead of pkt->* members), pkt->* updated only after data completely formed, not in process. Update pkt->* after data buffer changed (with rx_*). Signed-off-by: Ivan Safonov --- drivers/staging/rtl8188eu/include/rtw_recv.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/staging/rtl8188eu/include/rtw_recv.h b/drivers/staging/rtl8188eu/include/rtw_recv.h index 2e5caa4..d4d8a74 100644 --- a/drivers/staging/rtl8188eu/include/rtw_recv.h +++ b/drivers/staging/rtl8188eu/include/rtw_recv.h @@ -261,6 +261,8 @@ static inline u8 *recvframe_pull(struct recv_frame *precvframe, int sz) if (precvframe == NULL) return NULL; + + skb_pull(precvframe->pkt, sz); precvframe->rx_data += sz; if (precvframe->rx_data > precvframe->rx_tail) { precvframe->rx_data -= sz; @@ -278,7 +280,7 @@ static inline u8 *recvframe_put(struct recv_frame *precvframe, int sz) if (precvframe == NULL) return NULL; - + skb_put(precvframe->pkt, sz); precvframe->rx_tail += sz; if (precvframe->rx_tail > precvframe->pkt->end) { @@ -299,6 +301,7 @@ static inline u8 *recvframe_pull_tail(struct recv_frame *precvframe, int sz) if (precvframe == NULL) return NULL; + skb_trim(precvframe->pkt, precvframe->pkt->len - sz); precvframe->rx_tail -= sz; if (precvframe->rx_tail < precvframe->rx_data) { precvframe->rx_tail += sz; -- 2.10.2