]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
mwifiex: fix crash in SDIO RX path
authorAvinash Patil <patila@marvell.com>
Wed, 18 Mar 2015 14:42:52 +0000 (20:12 +0530)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 20 Mar 2015 07:07:11 +0000 (09:07 +0200)
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>
drivers/net/wireless/mwifiex/sdio.c

index 330e9d06729df9651e32c881c17e8b23ac0f302b..4f08c58989aff8a491c4e0e836858f09021b0c87 100644 (file)
@@ -1375,7 +1375,7 @@ rx_curr_single:
        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->len, port);
+               mp_rx_aggr_setup(card, rx_len, port);
        }
 
        return 0;