lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	drivers/net/bnx2x_main.c

Merge bnx2x bug fixes in by hand... :-/

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2010-07-27 21:01:35 -07:00
parent b8bc0421ab 5447080cfa
commit bb7e95c8fd
19 changed files with 147 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/mac80211/cfg.c
View File

@@ -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,