diff options
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 17e32722281b..a8ef547eb08d 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1433,9 +1433,8 @@ static void net_tx_action(struct softirq_action *h) } } -#if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) +#if defined(CONFIG_BRIDGE) || defined (CONFIG_BRIDGE_MODULE) int (*br_handle_frame_hook)(struct sk_buff *skb) = NULL; -#endif static __inline__ int handle_bridge(struct sk_buff *skb, struct packet_type *pt_prev) @@ -1454,6 +1453,7 @@ static __inline__ int handle_bridge(struct sk_buff *skb, return ret; } +#endif #ifdef CONFIG_NET_DIVERT static inline int handle_diverter(struct sk_buff *skb) @@ -1510,12 +1510,13 @@ int netif_receive_skb(struct sk_buff *skb) #endif /* CONFIG_NET_DIVERT */ #if defined(CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) - if (skb->dev->br_port && br_handle_frame_hook) { + if (skb->dev->br_port) { int ret; ret = handle_bridge(skb, pt_prev); - if (br_handle_frame_hook(skb) == 0) + if (br_handle_frame_hook(skb) == 0) return ret; + pt_prev = NULL; } #endif |