diff options
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_input.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c index 0145e9416714..30b88777c3df 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c | |||
| @@ -134,14 +134,11 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb) | |||
| 134 | if (skb->protocol == htons(ETH_P_PAUSE)) | 134 | if (skb->protocol == htons(ETH_P_PAUSE)) |
| 135 | goto drop; | 135 | goto drop; |
| 136 | 136 | ||
| 137 | /* Process STP BPDU's through normal netif_receive_skb() path */ | 137 | if (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev, |
| 138 | if (p->br->stp_enabled != BR_NO_STP) { | 138 | NULL, br_handle_local_finish)) |
| 139 | if (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev, | 139 | return NULL; /* frame consumed by filter */ |
| 140 | NULL, br_handle_local_finish)) | 140 | else |
| 141 | return NULL; | 141 | return skb; /* continue processing */ |
| 142 | else | ||
| 143 | return skb; | ||
| 144 | } | ||
| 145 | } | 142 | } |
| 146 | 143 | ||
| 147 | switch (p->state) { | 144 | switch (p->state) { |