---

yaml --- r: 145132 b: refs/heads/master c: a598f6a h: refs/heads/master v: v3
git-mirror · May 18, 2009 · 3a389d3 · 3a389d3
1 parent 5f55e2b
commit 3a389d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8f492c6ac6072d6c5bce4b2f13dc44612991051
+refs/heads/master: a598f6aebea2481531b0757ed90cfb0d8cf1d8f5
diff --git a/trunk/net/bridge/br_input.c b/trunk/net/bridge/br_input.c
@@ -134,13 +134,18 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
 		if (skb->protocol == htons(ETH_P_PAUSE))
 			goto drop;
 
+		/* If STP is turned off, then forward */
+		if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0)
+			goto forward;
+
 		if (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
 			    NULL, br_handle_local_finish))
 			return NULL;	/* frame consumed by filter */
 		else
 			return skb;	/* continue processing */
 	}
 
+forward:
 	switch (p->state) {
 	case BR_STATE_FORWARDING:
 		rhook = rcu_dereference(br_should_route_hook);