From df6286afa0c305fc65ad20de5e91c38e4e30c5ac Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Sun, 22 Aug 2010 17:35:32 +0000 Subject: [PATCH] --- yaml --- r: 213908 b: refs/heads/master c: c2368e795cec561229ef66a04ac51629b918a9e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9614b420e38f..72f7b6a463e3 100644 --- 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 index 826cd5221536..6d04cfdf4541 100644 --- 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))