From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 7 Oct 2010 15:35:40 +0000 (-0400)
Subject: Revert "mac80211: use netif_receive_skb in ieee80211_tx_status callpath"
X-Git-Tag: v2.6.36-rc8~17^2~1^2
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=4efe7f51be508a13965f163006dcb32b38a914a3;hp=44271488b91c9eecf249e075a1805dd887e222d2;p=net-next-2.6.git

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>
---

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();