diff options
Diffstat (limited to 'net/bridge/br_input.c')
-rw-r--r-- | net/bridge/br_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 826cd5221536..25207a1f182b 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) | |||
141 | const unsigned char *dest = eth_hdr(skb)->h_dest; | 141 | const unsigned char *dest = eth_hdr(skb)->h_dest; |
142 | int (*rhook)(struct sk_buff *skb); | 142 | int (*rhook)(struct sk_buff *skb); |
143 | 143 | ||
144 | if (skb->pkt_type == PACKET_LOOPBACK) | 144 | if (unlikely(skb->pkt_type == PACKET_LOOPBACK)) |
145 | return skb; | 145 | return skb; |
146 | 146 | ||
147 | if (!is_valid_ether_addr(eth_hdr(skb)->h_source)) | 147 | if (!is_valid_ether_addr(eth_hdr(skb)->h_source)) |
@@ -159,7 +159,7 @@ struct sk_buff *br_handle_frame(struct sk_buff *skb) | |||
159 | goto drop; | 159 | goto drop; |
160 | 160 | ||
161 | /* If STP is turned off, then forward */ | 161 | /* If STP is turned off, then forward */ |
162 | if (p->br->stp_enabled == BR_NO_STP && dest[5] == 0) | 162 | if (p->br->stp_enabled == BR_NO_STP) |
163 | goto forward; | 163 | goto forward; |
164 | 164 | ||
165 | if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev, | 165 | if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev, |