|
@@ -134,14 +134,11 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
|
|
if (skb->protocol == htons(ETH_P_PAUSE))
|
|
if (skb->protocol == htons(ETH_P_PAUSE))
|
|
goto drop;
|
|
goto drop;
|
|
|
|
|
|
- /* Process STP BPDU's through normal netif_receive_skb() path */
|
|
|
|
- if (p->br->stp_enabled != BR_NO_STP) {
|
|
|
|
- if (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
|
|
|
|
- NULL, br_handle_local_finish))
|
|
|
|
- return NULL;
|
|
|
|
- else
|
|
|
|
- return skb;
|
|
|
|
- }
|
|
|
|
|
|
+ if (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
|
|
|
|
+ NULL, br_handle_local_finish))
|
|
|
|
+ return NULL; /* frame consumed by filter */
|
|
|
|
+ else
|
|
|
|
+ return skb; /* continue processing */
|
|
}
|
|
}
|
|
|
|
|
|
switch (p->state) {
|
|
switch (p->state) {
|