netif_receive_skb);
}
-@@ -205,7 +205,7 @@ rx_handler_result_t br_handle_frame(stru
+@@ -209,7 +209,7 @@ rx_handler_result_t br_handle_frame(stru
}
/* Deliver packet to local host only */
NULL, br_handle_local_finish)) {
return RX_HANDLER_CONSUMED; /* consumed by filter */
} else {
-@@ -230,7 +230,7 @@ forward:
+@@ -224,7 +224,7 @@ forward:
+ if (ether_addr_equal(p->br->dev->dev_addr, dest))
+ skb->pkt_type = PACKET_HOST;
+
+- if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
++ if (BR_HOOK(NFPROTO_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
+ br_handle_local_finish))
+ break;
+
+@@ -246,7 +246,7 @@ forward:
if (ether_addr_equal(p->br->dev->dev_addr, dest))
skb->pkt_type = PACKET_HOST;
if (vlan_tx_tag_present(skb))
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
-@@ -698,15 +698,29 @@ static inline u16 br_get_pvid(const stru
+@@ -699,15 +699,29 @@ static inline u16 br_get_pvid(const stru
/* br_netfilter.c */
#ifdef CONFIG_BRIDGE_NETFILTER