---

yaml --- r: 102997 b: refs/heads/master c: 43aa192 h: refs/heads/master i: 102995: 3fba44f v: v3
git-mirror · Jun 17, 2008 · 3bb7aef · 3bb7aef
1 parent 35d5181
commit 3bb7aef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d00fb9eb11ac49d4035f756d116deeeaf99a26b
+refs/heads/master: 43aa1920117801fe9ae3d1fad886b62511e09bee
diff --git a/trunk/net/bridge/br_input.c b/trunk/net/bridge/br_input.c
@@ -134,14 +134,11 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
 		if (skb->protocol == htons(ETH_P_PAUSE))
 			goto drop;
 
-		/* Process STP BPDU's through normal netif_receive_skb() path */
-		if (p->br->stp_enabled != BR_NO_STP) {
-			if (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
-				    NULL, br_handle_local_finish))
-				return NULL;
-			else
-				return skb;
-		}
+		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 */
 	}
 
 	switch (p->state) {