From c78189422f49b657c19958b8128213fe948fcf1d Mon Sep 17 00:00:00 2001
From: Florian Westphal <fw@strlen.de>
Date: Mon, 3 Jan 2011 04:16:28 +0000
Subject: [PATCH] --- yaml --- r: 223769 b: refs/heads/master c:
 e6f26129ebbb0071016e2526036f42036ccf30e1 h: refs/heads/master i:   223767:
 58a0aabae3d51dcd4f47a1ac06936b921f23c538 v: v3

---
 [refs]                         | 2 +-
 trunk/net/bridge/br_stp_bpdu.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1b23a05c689a..99e17137ebbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d89081d698132b5f964aea88112f76492563ee9
+refs/heads/master: e6f26129ebbb0071016e2526036f42036ccf30e1
diff --git a/trunk/net/bridge/br_stp_bpdu.c b/trunk/net/bridge/br_stp_bpdu.c
index 35cf27087b56..e3d7aefa9181 100644
--- a/trunk/net/bridge/br_stp_bpdu.c
+++ b/trunk/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);
 }