diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-26 22:26:09 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-26 22:26:09 +0200 |
| commit | a9ad99a612763803b995ce551ca43b20beb1f888 (patch) | |
| tree | daff243cc83116bdcffc5f675d0f33c0f777cc69 /net | |
| parent | net: dev_forward_skb should call nf_reset (diff) | |
| parent | ath9k: fix dma direction for map/unmap in ath_rx_tasklet (diff) | |
| download | linux-a9ad99a612763803b995ce551ca43b20beb1f888.tar.xz linux-a9ad99a612763803b995ce551ca43b20beb1f888.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index c7000a6ca379..67ee34f57df7 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -632,7 +632,7 @@ static void ieee80211_send_layer2_update(struct sta_info *sta) skb->dev = sta->sdata->dev; skb->protocol = eth_type_trans(skb, sta->sdata->dev); memset(skb->cb, 0, sizeof(skb->cb)); - netif_rx(skb); + netif_rx_ni(skb); } static void sta_apply_parameters(struct ieee80211_local *local, |