diff options
author | Avinash Patil <patila@marvell.com> | 2015-03-18 10:42:52 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-03-20 03:07:11 -0400 |
commit | 080465f27aca1315cf882297cf31a376452fa188 (patch) | |
tree | 54ff6e574cae4ff64ce7a0e362090901fda88ca8 /drivers/net/wireless/mwifiex | |
parent | 55ab9a72bd324648987063e283ab3d4228efdaef (diff) |
mwifiex: fix crash in SDIO RX path
With patch '960d6d08e39 "mwifiex: delay skb allocation for RX
until cmd53 over"' we no more pass skb parameter to MP aggregation setup
helper function. We instead pass length to be aggregated.
This patch fixes an issue where we were passing length parameter of NULL
skb to aggregation routine resulting into crash. We should instead pass
rx_len received from mp_regs.
Signed-off-by: Avinash Patil <patila@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r-- | drivers/net/wireless/mwifiex/sdio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c index 330e9d06729d..4f08c58989af 100644 --- a/drivers/net/wireless/mwifiex/sdio.c +++ b/drivers/net/wireless/mwifiex/sdio.c | |||
@@ -1375,7 +1375,7 @@ rx_curr_single: | |||
1375 | if (f_post_aggr_cur) { | 1375 | if (f_post_aggr_cur) { |
1376 | dev_dbg(adapter->dev, "info: current packet aggregation\n"); | 1376 | dev_dbg(adapter->dev, "info: current packet aggregation\n"); |
1377 | /* Curr pkt can be aggregated */ | 1377 | /* Curr pkt can be aggregated */ |
1378 | mp_rx_aggr_setup(card, skb->len, port); | 1378 | mp_rx_aggr_setup(card, rx_len, port); |
1379 | } | 1379 | } |
1380 | 1380 | ||
1381 | return 0; | 1381 | return 0; |