diff --git a/[refs] b/[refs] index 2745385be64c..181f17f1c868 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5548a8a1138c96e3e6f803c9f2c1f9389c2f0ee6 +refs/heads/master: 5ed3bc7288487bd4f891f420a07319e0b538b4fe diff --git a/trunk/net/mac80211/status.c b/trunk/net/mac80211/status.c index 34da67995d94..10caec5ea8fa 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_rx(skb2); + netif_receive_skb(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_rx(skb); + netif_receive_skb(skb); skb = NULL; } rcu_read_unlock();