diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-26 16:26:09 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-26 16:26:09 -0400 |
| commit | a9ad99a612763803b995ce551ca43b20beb1f888 (patch) | |
| tree | daff243cc83116bdcffc5f675d0f33c0f777cc69 /net | |
| parent | c736eefadb71a01a5e61e0de700f28f6952b4444 (diff) | |
| parent | f792af250de54309e4bc9f238db3623ead0a4507 (diff) | |
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) | |||
| 632 | skb->dev = sta->sdata->dev; | 632 | skb->dev = sta->sdata->dev; |
| 633 | skb->protocol = eth_type_trans(skb, sta->sdata->dev); | 633 | skb->protocol = eth_type_trans(skb, sta->sdata->dev); |
| 634 | memset(skb->cb, 0, sizeof(skb->cb)); | 634 | memset(skb->cb, 0, sizeof(skb->cb)); |
| 635 | netif_rx(skb); | 635 | netif_rx_ni(skb); |
| 636 | } | 636 | } |
| 637 | 637 | ||
| 638 | static void sta_apply_parameters(struct ieee80211_local *local, | 638 | static void sta_apply_parameters(struct ieee80211_local *local, |