summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalle Valo2009-10-13 19:33:21 +0200
committerJohn W. Linville2009-10-27 21:48:21 +0100
commit878283f19809bc73872c70ea53381f74a43a15e7 (patch)
tree9b035a70f1b524cde7834c7e76e649455b0017ff
parentmac80211: add ieee80211_rx_ni() (diff)
downloadkernel-qcow2-linux-878283f19809bc73872c70ea53381f74a43a15e7.tar.gz
kernel-qcow2-linux-878283f19809bc73872c70ea53381f74a43a15e7.tar.xz
kernel-qcow2-linux-878283f19809bc73872c70ea53381f74a43a15e7.zip
wl1251: use ieee80211_rx_ni()
Because of SPI and SDIO wl1251 does everything in a workqueue, including calling ieee80211_rx() which should be called with bottom halves disabled. An error message is emitted because of this: NOHZ: local_softirq_pending 08 Fix this by using ieee80211_rx_ni(). Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_rx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_rx.c b/drivers/net/wireless/wl12xx/wl1251_rx.c
index 17c54b59ef86..601fe0d67827 100644
--- a/drivers/net/wireless/wl12xx/wl1251_rx.c
+++ b/drivers/net/wireless/wl12xx/wl1251_rx.c
@@ -153,7 +153,7 @@ static void wl1251_rx_body(struct wl1251 *wl,
beacon ? "beacon" : "");
memcpy(IEEE80211_SKB_RXCB(skb), &status, sizeof(status));
- ieee80211_rx(wl->hw, skb);
+ ieee80211_rx_ni(wl->hw, skb);
}
static void wl1251_rx_ack(struct wl1251 *wl)