From: Avinash Patil Date: Wed, 18 Mar 2015 14:42:52 +0000 (+0530) Subject: mwifiex: fix crash in SDIO RX path X-Git-Tag: v4.1-rc1~128^2~95^2~28 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=080465f27aca1315cf882297cf31a376452fa188;p=karo-tx-linux.git 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 Signed-off-by: Amitkumar Karwar Signed-off-by: Kalle Valo --- 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: 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;