From patchwork Tue May 23 07:12:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinming Hu X-Patchwork-Id: 9741999 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 91D516032B for ; Tue, 23 May 2017 07:12:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84973286E1 for ; Tue, 23 May 2017 07:12:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7979928718; Tue, 23 May 2017 07:12:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDDBA286E1 for ; Tue, 23 May 2017 07:12:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761759AbdEWHMx (ORCPT ); Tue, 23 May 2017 03:12:53 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:36553 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758942AbdEWHMv (ORCPT ); Tue, 23 May 2017 03:12:51 -0400 Received: by mail-pf0-f194.google.com with SMTP id n23so25531232pfb.3 for ; Tue, 23 May 2017 00:12:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jAtJVSj/YWsJyyKtlzAbL0LDjIHmrwvvelrdWUSM96o=; b=U3fABNX9OGtyvUradCOE094g/vh7omq4MpO5b04ghmLO8mruT9IIsk29x1SGFwxfRG iJrNDqUC2ARkKzjmKJLOeAuBwjO5GaiiaMSCMmjNr1cvadMheu7PTRcYYA3MrnjyhiKY e9r6hvWH5Uc6F+/7tLsPwx1P4t1k4+UuhOb0TFqGEPIXFFLVEUtHRS/3tnpZEPT2OwnE dVZoXuoswCRH/Ka4KpueH6eL91XNKJWcKEGw87ys3Nj2vPR1vu94RWLDd0uT71qAcOZD 5DZlh18mcmbC3z4qL9LJ/SG6YMn84X/0/bMyRz4gNxrJq8IGZGPPlegAedqpB4iXjUev 1uAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jAtJVSj/YWsJyyKtlzAbL0LDjIHmrwvvelrdWUSM96o=; b=YL/H3lF+EzQAL+VfU3pbJxnsmvBcYvIWehn9aoMxxrqvFcLOJzRaMaCGu9YtlujljM z2iLWVkT1XhuYd7kzMq7WjbOa97PPrRflzJqWTrIO+1AOvzgD4PqLEAXwKY6g72pjxO+ G2Yx8RL57swerCyfNpw3+Ahy4sJ56h1UtBkfOmCOyQmhHjtgG4LWHSJhu3ReBEYjeHey z/rausSGA23hp3hc7E/hbN72lPWfTL79IlW+iMop9lsS25aF29Un6/0uJuaf0toDyjqy wFYrUwVryTuhbbpHwkAgb9oGJHpWIne+sphI9ZqRjCEyz1ZDI3QSm0UsRuhpjVAiVf1+ jIwQ== X-Gm-Message-State: AODbwcCAoAD3cg5w8g1YP62nld/AVNq2orYV0ZWYUAINuVboVOKFyUpn MdnVChVHMW//hg== X-Received: by 10.98.178.130 with SMTP id z2mr22329374pfl.77.1495523570882; Tue, 23 May 2017 00:12:50 -0700 (PDT) Received: from ubuntu.members.linode.com ([2400:8902::f03c:91ff:fee7:7cf1]) by smtp.gmail.com with ESMTPSA id e16sm32753518pfk.100.2017.05.23.00.12.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 May 2017 00:12:50 -0700 (PDT) From: Xinming Hu To: Linux Wireless Cc: Kalle Valo , Brian Norris , Dmitry Torokhov , rajatja@google.com, Zhiyuan Yang , Cathy Luo , Xinming Hu , Ganapathi Bhat Subject: [PATCH v4 5/5] mwifiex: check next packet length for usb tx aggregation Date: Tue, 23 May 2017 07:12:34 +0000 Message-Id: <1495523554-30753-5-git-send-email-huxinming820@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1495523554-30753-1-git-send-email-huxinming820@gmail.com> References: <1495523554-30753-1-git-send-email-huxinming820@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Xinming Hu The next packet length will be used by interface driver, to check if the next packet still could be aggregated. Signed-off-by: Xinming Hu Signed-off-by: Cathy Luo Signed-off-by: Ganapathi Bhat --- v3: same as v1,v2 v4: correct if/else indent(Brain) --- drivers/net/wireless/marvell/mwifiex/11n_aggr.c | 12 ++++++------ drivers/net/wireless/marvell/mwifiex/txrx.c | 4 ++-- drivers/net/wireless/marvell/mwifiex/wmm.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c index e8ffb26..53e6752 100644 --- a/drivers/net/wireless/marvell/mwifiex/11n_aggr.c +++ b/drivers/net/wireless/marvell/mwifiex/11n_aggr.c @@ -250,15 +250,15 @@ return 0; } + if (skb_src) + tx_param.next_pkt_len = skb_src->len + sizeof(struct txpd); + else + tx_param.next_pkt_len = 0; + if (adapter->iface_type == MWIFIEX_USB) { ret = adapter->if_ops.host_to_card(adapter, priv->usb_port, - skb_aggr, NULL); + skb_aggr, &tx_param); } else { - if (skb_src) - tx_param.next_pkt_len = - skb_src->len + sizeof(struct txpd); - else - tx_param.next_pkt_len = 0; ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA, skb_aggr, &tx_param); diff --git a/drivers/net/wireless/marvell/mwifiex/txrx.c b/drivers/net/wireless/marvell/mwifiex/txrx.c index 15e92af..d848933 100644 --- a/drivers/net/wireless/marvell/mwifiex/txrx.c +++ b/drivers/net/wireless/marvell/mwifiex/txrx.c @@ -117,7 +117,7 @@ int mwifiex_process_tx(struct mwifiex_private *priv, struct sk_buff *skb, if (adapter->iface_type == MWIFIEX_USB) { ret = adapter->if_ops.host_to_card(adapter, priv->usb_port, - skb, NULL); + skb, tx_param); } else { ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA, @@ -185,7 +185,7 @@ static int mwifiex_host_to_card(struct mwifiex_adapter *adapter, if (adapter->iface_type == MWIFIEX_USB) { ret = adapter->if_ops.host_to_card(adapter, priv->usb_port, - skb, NULL); + skb, tx_param); } else { ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA, diff --git a/drivers/net/wireless/marvell/mwifiex/wmm.c b/drivers/net/wireless/marvell/mwifiex/wmm.c index e4ff3b9..75cdd55 100644 --- a/drivers/net/wireless/marvell/mwifiex/wmm.c +++ b/drivers/net/wireless/marvell/mwifiex/wmm.c @@ -1363,13 +1363,13 @@ void mwifiex_rotate_priolists(struct mwifiex_private *priv, spin_unlock_irqrestore(&priv->wmm.ra_list_spinlock, ra_list_flags); + tx_param.next_pkt_len = + ((skb_next) ? skb_next->len + + sizeof(struct txpd) : 0); if (adapter->iface_type == MWIFIEX_USB) { ret = adapter->if_ops.host_to_card(adapter, priv->usb_port, - skb, NULL); + skb, &tx_param); } else { - tx_param.next_pkt_len = - ((skb_next) ? skb_next->len + - sizeof(struct txpd) : 0); ret = adapter->if_ops.host_to_card(adapter, MWIFIEX_TYPE_DATA, skb, &tx_param); }