Received: by 10.213.65.68 with SMTP id h4csp1756975imn; Mon, 19 Mar 2018 12:24:59 -0700 (PDT) X-Google-Smtp-Source: AG47ELtkUADjbdtUEcJ5tyBJ+4gX2mpcRdX5yBAW4fbuSc80TiJh5ciKq/Y4Dcs04lgcSGhVpTm7 X-Received: by 10.98.61.80 with SMTP id k77mr4808718pfa.2.1521487499081; Mon, 19 Mar 2018 12:24:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521487499; cv=none; d=google.com; s=arc-20160816; b=m/H7aDDy3AJjkdReLGwM1UVl3mmoxJWZt4/pOtBiu5yNiiCoYLqy4/XI7q7nuaP6wL gA74JGtUB50SIxsV2m4esUjc2sx6KP/4oh5+sdBLWJCfIu/N7Nc0y9bwvTBcCMeDEE8b /lvnrl0YtHFaT+JzQqeruU4r2CFqlq8JUvOAl0uw+O6cGEAJfci1e/uyB6IauAyyrXjO V6rwbKDCnIwmAuVbHMk5FxR9lPqPHYeu3HCl2e66JbNnqk0jIfj0UrPrsGV/aAN/CYUw SHty0vDZYQ+s97ue716nxbw1degpX/U10SVdt1Vm0W64LWtPj0gWbqCdkLKbbXyHJSP3 x88g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=ppIAli9LbMoS+7JFpCpCvMENLjOoTRy+xb8UdB6ot8E=; b=RZAqa5rr2m6lMrUVkK7vmpAc1Je7LUYfpi+NvAlTObdVQ8Ye3lY5wH3yYSz8WWbpGt U3IGH7BBfKPnL7SxqwWkazPSsS70f6414bPF8Tp9/7jLACBmJXUroMTxgNG0vDPe8lbf X5lc76aK0AXVFRZ3DsFuPVhEFp1mF5ECz5w0sohtl8jbJTZQOsy/zn7h3mnE2UyyMVmr 8auQ6B1qexKZlNYzLJ9gKDR9sd93sxmpqGgLwg8WhSa00VD0yjKFJfVIKH1VIOLFwpef xRi2rfkwAeQLUwRRRyofeCKs+XmrzSY3Xt7ySN+0P3I2G7s1srZ6hXTM03c3Ks9ajeuP Yz+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u25si355582pgv.221.2018.03.19.12.24.44; Mon, 19 Mar 2018 12:24:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935858AbeCSTVy (ORCPT + 99 others); Mon, 19 Mar 2018 15:21:54 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:50298 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031609AbeCSSZO (ORCPT ); Mon, 19 Mar 2018 14:25:14 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id CD14D100B; Mon, 19 Mar 2018 18:25:13 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ganapathi Bhat , Kalle Valo , Sasha Levin Subject: [PATCH 4.9 163/241] mwifiex: Fix invalid port issue Date: Mon, 19 Mar 2018 19:07:08 +0100 Message-Id: <20180319180757.913669758@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319180751.172155436@linuxfoundation.org> References: <20180319180751.172155436@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ganapathi Bhat [ Upstream commit ecd7eb7c2bcf99f6c23d68ad56ce15949da848a1 ] We have to use start port, for TX/RX of single packet, instead of current aggregating port. This will fix SDIO CMD53(TX/RX) returning -ETIMEDOUT and halting the data path. Fixes: 0cb52aac4d19 ("mwifiex: do not set multiport flag for tx/rx single packet") Signed-off-by: Ganapathi Bhat Signed-off-by: Kalle Valo Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/marvell/mwifiex/sdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -1458,7 +1458,7 @@ static int mwifiex_sdio_card_to_host_mp_ } if (card->mpa_rx.pkt_cnt == 1) - mport = adapter->ioport + port; + mport = adapter->ioport + card->mpa_rx.start_port; if (mwifiex_read_data_sync(adapter, card->mpa_rx.buf, card->mpa_rx.buf_len, mport, 1)) @@ -1891,7 +1891,7 @@ static int mwifiex_host_to_card_mp_aggr( } if (card->mpa_tx.pkt_cnt == 1) - mport = adapter->ioport + port; + mport = adapter->ioport + card->mpa_tx.start_port; ret = mwifiex_write_data_to_card(adapter, card->mpa_tx.buf, card->mpa_tx.buf_len, mport);