X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fbridge%2Fbr_input.c;h=25207a1f182be33d9b588a3d5fdbc1273c269409;hb=e0e170bd7ded2ec16e2813d63c0faff43193fde8;hp=826cd5221536cadd3b0d13dfec2e9d3639b92a93;hpb=946880fa270c18c137654af70ba939f03181c6b6;p=~andy%2Flinux

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 826cd522153..25207a1f182 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -141,7 +141,7 @@ struct sk_buff *br_handle_frame(struct sk_buff *skb)
 	const unsigned char *dest = eth_hdr(skb)->h_dest;
 	int (*rhook)(struct sk_buff *skb);
 
-	if (skb->pkt_type == PACKET_LOOPBACK)
+	if (unlikely(skb->pkt_type == PACKET_LOOPBACK))
 		return skb;
 
 	if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
@@ -159,7 +159,7 @@ struct sk_buff *br_handle_frame(struct sk_buff *skb)
 			goto drop;
 
 		/* If STP is turned off, then forward */
-		if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0)
+		if (p->br->stp_enabled == BR_NO_STP)
 			goto forward;
 
 		if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,