diff mbox

mwifiex: fix a bug in Rx multiport aggregation logic

Message ID 1426145920-5288-1-git-send-email-akarwar@marvell.com (mailing list archive)
State Rejected
Delegated to: Kalle Valo
Headers show

Commit Message

Amitkumar Karwar March 12, 2015, 7:38 a.m. UTC 
From: Cathy Luo <cluo@marvell.com>

It's been observed Rx aggregated packets are always followed
by a single Rx packet. This patch improves our logic to add
that extra packet in next aggregation.

Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
---
 drivers/net/wireless/mwifiex/sdio.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Amitkumar Karwar March 12, 2015, 2:07 p.m. UTC | #1 
> -----Original Message-----
> From: Amitkumar Karwar [mailto:akarwar@marvell.com]
> Sent: Thursday, March 12, 2015 1:09 PM
> To: linux-wireless@vger.kernel.org
> Cc: Cathy Luo; Avinash Patil; Amitkumar Karwar
> Subject: [PATCH] mwifiex: fix a bug in Rx multiport aggregation logic
> 
> From: Cathy Luo <cluo@marvell.com>
> 
> It's been observed Rx aggregated packets are always followed by a
> single Rx packet. This patch improves our logic to add that extra
> packet in next aggregation.
> 
> Signed-off-by: Cathy Luo <cluo@marvell.com>
> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
> ---

Please ignore this patch. This is same as "[PATCH 1/3] mwifiex: fix 
a bug..." sent separately.

Regards,
Amit
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kalle Valo March 13, 2015, 2:29 p.m. UTC | #2 
Amitkumar Karwar <akarwar@marvell.com> writes:

>> -----Original Message-----
>> From: Amitkumar Karwar [mailto:akarwar@marvell.com]
>> Sent: Thursday, March 12, 2015 1:09 PM
>> To: linux-wireless@vger.kernel.org
>> Cc: Cathy Luo; Avinash Patil; Amitkumar Karwar
>> Subject: [PATCH] mwifiex: fix a bug in Rx multiport aggregation logic
>> 
>> From: Cathy Luo <cluo@marvell.com>
>> 
>> It's been observed Rx aggregated packets are always followed by a
>> single Rx packet. This patch improves our logic to add that extra
>> packet in next aggregation.
>> 
>> Signed-off-by: Cathy Luo <cluo@marvell.com>
>> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
>> ---
>
> Please ignore this patch. This is same as "[PATCH 1/3] mwifiex: fix 
> a bug..." sent separately.

Ok, I dropped this patch.
diff mbox

Patch

diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 57d85ab..9ef010b 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -1133,6 +1133,7 @@  static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
 	s32 f_do_rx_aggr = 0;
 	s32 f_do_rx_cur = 0;
 	s32 f_aggr_cur = 0;
+	s32 f_post_aggr_cur = 0;
 	struct sk_buff *skb_deaggr;
 	u32 pind;
 	u32 pkt_len, pkt_type, mport;
@@ -1169,7 +1170,7 @@  static int mwifiex_sdio_card_to_host_mp_aggr(struct mwifiex_adapter *adapter,
 			} else {
 				/* No room in Aggr buf, do rx aggr now */
 				f_do_rx_aggr = 1;
-				f_do_rx_cur = 1;
+				f_post_aggr_cur = 1;
 			}
 		} else {
 			/* Rx aggr not in progress */
@@ -1280,9 +1281,13 @@  rx_curr_single:
 
 		mwifiex_decode_rx_packet(adapter, skb, pkt_type);
 	}
+	if (f_post_aggr_cur) {
+		dev_dbg(adapter->dev, "info: current packet aggregation\n");
+		/* Curr pkt can be aggregated */
+		mp_rx_aggr_setup(card, skb, port);
+	}
 
 	return 0;
-
 error:
 	if (MP_RX_AGGR_IN_PROGRESS(card)) {
 		/* Multiport-aggregation transfer failed - cleanup */