diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-28 00:01:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-28 00:01:35 -0400 |
| commit | bb7e95c8fd859922c6cf3ebbb3a8546007df1748 (patch) | |
| tree | 58b54c6306ba168b76f25cc6dc9a2d1d2eb830a7 /net/mac80211 | |
| parent | b8bc0421ab7f83712a0a8ef7eb05fa73ec53c027 (diff) | |
| parent | 5447080cfa3c77154498dfbf225367ac85b4c2b5 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bnx2x_main.c
Merge bnx2x bug fixes in by hand... :-/
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211')
| -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 a3f3325df9f2..db4d9340c846 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, |