diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 15:19:22 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 15:19:22 +0200 |
| commit | f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0 (patch) | |
| tree | 44419bd03c33e662302dd003f57d36e133144f91 /net/mac80211/cfg.c | |
| parent | Merge branch 'l7200' into devel (diff) | |
| parent | ARM: 6277/1: mach-shmobile: Allow users to select HZ, default to 128 (diff) | |
| download | linux-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.tar.xz linux-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.zip | |
Merge branch 'shmobile' into devel
Diffstat (limited to 'net/mac80211/cfg.c')
| -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, |