wl12xx: use _ni version of ieee80211_tx_status

wl1271_flush_deferred_work(), which calls ieee80211_rx() and
ieee80211_tx_status(), is called from a process context.
hence, use ieee80211_tx_status_ni() instead of ieee80211_tx_status().

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 8e2f560812d4f1e56fd066e1cf0c5988ba857114..c9f59ce04746a3f95b3c84afbc74baf204aab413 100644 (file)
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -870,7 +870,7 @@ static void wl1271_flush_deferred_work(struct wl1271 *wl)
 
        /* Return sent skbs to the network stack */
        while ((skb = skb_dequeue(&wl->deferred_tx_queue)))
-               ieee80211_tx_status(wl->hw, skb);
+               ieee80211_tx_status_ni(wl->hw, skb);
 }
 
 static void wl1271_netstack_work(struct work_struct *work)

diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/wl12xx/ps.c
index d3e377d7fe62fa7ce0cc586c12be6063d6abd0dd..5116db0826f9076303c46475d797b7f947f37f14 100644 (file)
--- a/drivers/net/wireless/wl12xx/ps.c
+++ b/drivers/net/wireless/wl12xx/ps.c
@@ -204,7 +204,7 @@ static void wl1271_ps_filter_frames(struct wl1271 *wl, u8 hlid)
                        info = IEEE80211_SKB_CB(skb);
                        info->flags |= IEEE80211_TX_STAT_TX_FILTERED;
                        info->status.rates[0].idx = -1;
-                       ieee80211_tx_status(wl->hw, skb);
+                       ieee80211_tx_status_ni(wl->hw, skb);
                        filtered++;
                }
        }

diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index 6603e60da04dd514e3bab252d735b0b8499e4e89..b2635c7ecee83b3d162f483098deaaa51f40d148 100644 (file)
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -782,7 +782,7 @@ void wl1271_tx_reset_link_queues(struct wl1271 *wl, u8 hlid)
                        info = IEEE80211_SKB_CB(skb);
                        info->status.rates[0].idx = -1;
                        info->status.rates[0].count = 0;
-                       ieee80211_tx_status(wl->hw, skb);
+                       ieee80211_tx_status_ni(wl->hw, skb);
                        total++;
                }
        }
@@ -820,7 +820,7 @@ void wl1271_tx_reset(struct wl1271 *wl, bool reset_tx_queues)
                                        info = IEEE80211_SKB_CB(skb);
                                        info->status.rates[0].idx = -1;
                                        info->status.rates[0].count = 0;
-                                       ieee80211_tx_status(wl->hw, skb);
+                                       ieee80211_tx_status_ni(wl->hw, skb);
                                }
                        }
                }
@@ -863,7 +863,7 @@ void wl1271_tx_reset(struct wl1271 *wl, bool reset_tx_queues)
                        info->status.rates[0].idx = -1;
                        info->status.rates[0].count = 0;
 
-                       ieee80211_tx_status(wl->hw, skb);
+                       ieee80211_tx_status_ni(wl->hw, skb);
                }
        }
 }