Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c27d3acc authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

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: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <coelho@ti.com>
parent ef4b29e9

drivers/net/wireless/wl12xx/main.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/net/wireless/wl12xx/ps.c

+1 −1
Original line number Diff line number Diff line
@@ -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++;

		}

	}

drivers/net/wireless/wl12xx/tx.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

		}

	}

}