aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-10-07 11:35:40 -0400
committerJohn W. Linville <linville@tuxdriver.com>2010-10-07 11:35:40 -0400
commit4efe7f51be508a13965f163006dcb32b38a914a3 (patch)
tree017d0a4069c3502be9101701a58e8b5b78c22c5a /net
parent44271488b91c9eecf249e075a1805dd887e222d2 (diff)
downloadmrst-s0i3-test-4efe7f51be508a13965f163006dcb32b38a914a3.tar.gz
mrst-s0i3-test-4efe7f51be508a13965f163006dcb32b38a914a3.tar.xz
mrst-s0i3-test-4efe7f51be508a13965f163006dcb32b38a914a3.zip
Revert "mac80211: use netif_receive_skb in ieee80211_tx_status callpath"
This reverts commit 5ed3bc7288487bd4f891f420a07319e0b538b4fe. It turns-out that not all drivers are calling ieee80211_tx_status from a compatible context. Revert this for now and try again later... Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/status.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c
index 10caec5ea8f..34da67995d9 100644
--- a/net/mac80211/status.c
+++ b/net/mac80211/status.c
@@ -377,7 +377,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
skb2 = skb_clone(skb, GFP_ATOMIC);
if (skb2) {
skb2->dev = prev_dev;
- netif_receive_skb(skb2);
+ netif_rx(skb2);
}
}
@@ -386,7 +386,7 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb)
}
if (prev_dev) {
skb->dev = prev_dev;
- netif_receive_skb(skb);
+ netif_rx(skb);
skb = NULL;
}
rcu_read_unlock();