---

yaml --- r: 64606 b: refs/heads/master c: df1c0b8 h: refs/heads/master v: v3
git-mirror · Aug 31, 2007 · 4f36b48 · 4f36b48
1 parent 8667d2f
commit 4f36b48
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b91ddd843751947e2f81dfc8a86c5c21cbe07158
+refs/heads/master: df1c0b8468b34628ed12b103804a4576cd9af8bb
diff --git a/trunk/net/bridge/br_fdb.c b/trunk/net/bridge/br_fdb.c
@@ -384,6 +384,11 @@ void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source,
 	if (hold_time(br) == 0)
 		return;
 
+	/* ignore packets unless we are using this port */
+	if (!(source->state == BR_STATE_LEARNING ||
+	      source->state == BR_STATE_FORWARDING))
+		return;
+
 	fdb = fdb_find(head, addr);
 	if (likely(fdb)) {
 		/* attempt to update an entry for a local interface */

diff --git a/trunk/net/bridge/br_input.c b/trunk/net/bridge/br_input.c
@@ -101,9 +101,8 @@ static int br_handle_local_finish(struct sk_buff *skb)
 {
 	struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
 
-	if (p && p->state != BR_STATE_DISABLED)
+	if (p)
 		br_fdb_update(p->br, p, eth_hdr(skb)->h_source);
-
 	return 0;	 /* process further */
 }