diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-20 15:55:07 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-03-20 15:55:07 +0000 |
| commit | 3a64a2209c815b3835d185c3e4b64d49fdb3dd5c (patch) | |
| tree | 563783f74f719cc2df7eda26751d2672187fd2d1 /target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch | |
| parent | 08c781ae46007809f09674e45e1fdbaa0353e597 (diff) | |
linux: refresh patches against 3.3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31047 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch')
| -rw-r--r-- | target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch index af793ee83..d2fdd614c 100644 --- a/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch @@ -9,7 +9,7 @@ netif_receive_skb); } -@@ -194,7 +194,7 @@ rx_handler_result_t br_handle_frame(stru +@@ -199,7 +199,7 @@ rx_handler_result_t br_handle_frame(stru } /* Deliver packet to local host only */ @@ -18,7 +18,7 @@ NULL, br_handle_local_finish)) { return RX_HANDLER_CONSUMED; /* consumed by filter */ } else { -@@ -219,7 +219,7 @@ forward: +@@ -224,7 +224,7 @@ forward: if (!compare_ether_addr(p->br->dev->dev_addr, dest)) skb->pkt_type = PACKET_HOST; @@ -43,7 +43,7 @@ if (vlan_tx_tag_present(skb)) --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h -@@ -492,12 +492,25 @@ static inline bool br_multicast_is_route +@@ -493,12 +493,25 @@ static inline bool br_multicast_is_route extern int br_netfilter_init(void); extern void br_netfilter_fini(void); extern void br_netfilter_rtable_init(struct net_bridge *); |