diff --git a/[refs] b/[refs] index 5f525e1e291f..a4eade504d13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6d27d2ac89359f84c1a559b5530967ff671d269 +refs/heads/master: 7573eac762af253e0b61b60cce34ab80f2dd45c7 diff --git a/trunk/net/mac80211/status.c b/trunk/net/mac80211/status.c index 95763e036975..3153c19893b8 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();