---

yaml --- r: 213908 b: refs/heads/master c: c2368e7 h: refs/heads/master v: v3
git-mirror · Aug 23, 2010 · df6286a · df6286a
1 parent 6c2a76b
commit df6286a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcb12fd2236f49aa8fdc1568ed4ebdfe4fddc6b5
+refs/heads/master: c2368e795cec561229ef66a04ac51629b918a9e8
diff --git a/trunk/net/bridge/br_input.c b/trunk/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))