diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2015-01-30 00:40:06 -0800 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-02-03 15:28:54 +0200 |
| commit | 0ea3186ce03cfa9b1c5cb8677ac3ffcd19695cd7 (patch) | |
| tree | a93049d12699089e8c5acaa06598592bd191bfb8 /drivers/net/wireless/mwifiex | |
| parent | 7a1f4e61eb6417aecd20822a5f15e72d21c7f3f9 (diff) | |
| download | op-kernel-dev-0ea3186ce03cfa9b1c5cb8677ac3ffcd19695cd7.zip op-kernel-dev-0ea3186ce03cfa9b1c5cb8677ac3ffcd19695cd7.tar.gz | |
mwifiex: fix NULL packet downloading issues
This patch makes sure that skb is freed after downloading
NULL packet in error cases. Also, USB chipsets return
-EINPROGRESS after downloading packets, they are freed in
USB completion handler later. We will add missing change
to set tx_lock_flag for USB which blocks further packets.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Cathy Luo <cluo@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
| -rw-r--r-- | drivers/net/wireless/mwifiex/sta_tx.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/sta_tx.c b/drivers/net/wireless/mwifiex/sta_tx.c index 1debe76..5ce2d9a 100644 --- a/drivers/net/wireless/mwifiex/sta_tx.c +++ b/drivers/net/wireless/mwifiex/sta_tx.c @@ -183,9 +183,13 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags) } switch (ret) { case -EBUSY: - adapter->data_sent = true; - /* Fall through FAILURE handling */ + dev_kfree_skb_any(skb); + dev_err(adapter->dev, "%s: host_to_card failed: ret=%d\n", + __func__, ret); + adapter->dbg.num_tx_host_to_card_failure++; + break; case -1: + adapter->data_sent = false; dev_kfree_skb_any(skb); dev_err(adapter->dev, "%s: host_to_card failed: ret=%d\n", __func__, ret); @@ -198,6 +202,7 @@ int mwifiex_send_null_packet(struct mwifiex_private *priv, u8 flags) adapter->tx_lock_flag = true; break; case -EINPROGRESS: + adapter->tx_lock_flag = true; break; default: break; |
