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

2011-01-04 11:57:25 -08:00
parent 7b26e5ebd8 9fc3bbb4a7
commit dbbe68bb12
14 changed files with 87 additions and 25 deletions
--- a/net/bridge/br_stp_bpdu.c
+++ b/net/bridge/br_stp_bpdu.c
@@ -50,6 +50,8 @@ static void br_send_bpdu(struct net_bridge_port *p,

 	llc_mac_hdr_init(skb, p->dev->dev_addr, p->br->group_addr);

+	skb_reset_mac_header(skb);
+
 	NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_OUT, skb, NULL, skb->dev,
 		dev_queue_xmit);
 }