diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2010-10-07 14:39:03 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-07 14:39:03 -0400 |
| commit | 7573eac762af253e0b61b60cce34ab80f2dd45c7 (patch) | |
| tree | 2ffafaa1313b08ea2c4cdf0dd96aa9e008840179 /net/mac80211/status.c | |
| parent | Revert "rtl8180: use NAPI for bottom-half processing" (diff) | |
| parent | Revert "mac80211: use netif_receive_skb in ieee80211_tx_status callpath" (diff) | |
| download | linux-dev-7573eac762af253e0b61b60cce34ab80f2dd45c7.tar.xz linux-dev-7573eac762af253e0b61b60cce34ab80f2dd45c7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/status.c')
| -rw-r--r-- | net/mac80211/status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 95763e036975..3153c19893b8 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(); |