linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: James Cameron <quozl@laptop.org>
To: Amitkumar Karwar <akarwar@marvell.com>,
	Avinash Patil <patila@marvell.com>
Cc: linux-wireless@vger.kernel.org
Subject: [RFC PATCH] mwifiex: handle command response in aggregation
Date: Fri, 23 Jan 2015 18:16:19 +1100	[thread overview]
Message-ID: <20150123071619.GA31644@us.netrek.org> (raw)

Firmware does occasionally pass a command response to the host on the
data port.  Ensure it is processed.

http://dev.laptop.org/ticket/12749
---
Seen on device firmwares:

	14.66.9.p96
	14.66.35.p52

Others not tested.

 drivers/net/wireless/mwifiex/sdio.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 933dae1..8fe6147 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -1240,8 +1240,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
 			/* copy pkt to deaggr buf */
 			skb_deaggr = card->mpa_rx.skb_arr[pind];
 
-			if ((pkt_type == MWIFIEX_TYPE_DATA) && (pkt_len <=
-					 card->mpa_rx.len_arr[pind])) {
+			if (pkt_len <= card->mpa_rx.len_arr[pind]) {
 
 				memcpy(skb_deaggr->data, curr_ptr, pkt_len);
 
@@ -1251,7 +1250,7 @@ static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
 				mwifiex_decode_rx_packet(adapter, skb_deaggr,
 							 pkt_type);
 			} else {
-				dev_err(adapter->dev, "wrong aggr pkt:"
+				dev_err(adapter->dev, "bad aggr pkt:"
 					" type=%d len=%d max_len=%d\n",
 					pkt_type, pkt_len,
 					card->mpa_rx.len_arr[pind]);
-- 
1.9.1


-- 
James Cameron
http://quozl.linux.org.au/

             reply	other threads:[~2015-01-23  7:16 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-23  7:16 James Cameron [this message]
2015-02-03  8:59 ` [RFC PATCH] mwifiex: handle command response in aggregation Amitkumar Karwar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150123071619.GA31644@us.netrek.org \
    --to=quozl@laptop.org \
    --cc=akarwar@marvell.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=patila@marvell.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).