|
|
|
@ -29,16 +29,16 @@ |
|
|
|
|
|
|
|
|
|
--- a/net/bridge/br_input.c
|
|
|
|
|
+++ b/net/bridge/br_input.c
|
|
|
|
|
@@ -52,7 +52,7 @@ static int br_pass_frame_up(struct sk_bu
|
|
|
|
|
indev = skb->dev;
|
|
|
|
|
skb->dev = brdev;
|
|
|
|
|
@@ -53,7 +53,7 @@ static int br_pass_frame_up(struct sk_bu
|
|
|
|
|
if (!skb)
|
|
|
|
|
return NET_RX_DROP;
|
|
|
|
|
|
|
|
|
|
- return NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
|
|
|
|
|
+ return BR_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
|
|
|
|
|
netif_receive_skb);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -213,7 +213,7 @@ rx_handler_result_t br_handle_frame(stru
|
|
|
|
|
@@ -214,7 +214,7 @@ rx_handler_result_t br_handle_frame(stru
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Deliver packet to local host only */
|
|
|
|
@ -47,7 +47,7 @@ |
|
|
|
|
NULL, br_handle_local_finish)) {
|
|
|
|
|
return RX_HANDLER_CONSUMED; /* consumed by filter */
|
|
|
|
|
} else {
|
|
|
|
|
@@ -228,7 +228,7 @@ forward:
|
|
|
|
|
@@ -229,7 +229,7 @@ forward:
|
|
|
|
|
if (ether_addr_equal(p->br->dev->dev_addr, dest))
|
|
|
|
|
skb->pkt_type = PACKET_HOST;
|
|
|
|
|
|
|
|
|
@ -56,7 +56,7 @@ |
|
|
|
|
br_handle_local_finish))
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
@@ -250,7 +250,7 @@ forward:
|
|
|
|
|
@@ -251,7 +251,7 @@ forward:
|
|
|
|
|
if (ether_addr_equal(p->br->dev->dev_addr, dest))
|
|
|
|
|
skb->pkt_type = PACKET_HOST;
|
|
|
|
|
|
|
|
|
|