From f973ec131a5bc421f395082b9eb5d2faeae7d871 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Thu, 7 Oct 2010 11:35:40 -0400 Subject: [PATCH] --- yaml --- r: 211427 b: refs/heads/master c: 4efe7f51be508a13965f163006dcb32b38a914a3 h: refs/heads/master i: 211425: 53462e413bd287b95721bb604cfabdad5cfd8280 211423: 1057ded866c50d2bbb7677caca5f8acdbfb8f441 v: v3 --- [refs] | 2 +- trunk/net/mac80211/status.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bd98f7805e10..c8bcabed417c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44271488b91c9eecf249e075a1805dd887e222d2 +refs/heads/master: 4efe7f51be508a13965f163006dcb32b38a914a3 diff --git a/trunk/net/mac80211/status.c b/trunk/net/mac80211/status.c index 10caec5ea8fa..34da67995d94 100644 --- a/trunk/net/mac80211/status.c +++ b/trunk/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();