diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-07-24 09:12:59 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-24 09:12:59 +0000 |
| commit | dd7650f67cdbdec6bc8ada714eeeb366eb70a62f (patch) | |
| tree | fc2973693b7e62b45b8e3015d41c1217c361d390 /target/linux/generic/patches-3.10/642-bridge_port_isolate.patch | |
| parent | 22419ae4cb52baccbfea40a0f461565c027350b8 (diff) | |
| download | mtk-20170518-dd7650f67cdbdec6bc8ada714eeeb366eb70a62f.zip mtk-20170518-dd7650f67cdbdec6bc8ada714eeeb366eb70a62f.tar.gz mtk-20170518-dd7650f67cdbdec6bc8ada714eeeb366eb70a62f.tar.bz2 | |
kernel: backport upstream bridge multicast snooping fixes
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 41817
Diffstat (limited to 'target/linux/generic/patches-3.10/642-bridge_port_isolate.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/642-bridge_port_isolate.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.10/642-bridge_port_isolate.patch b/target/linux/generic/patches-3.10/642-bridge_port_isolate.patch index 7a5a074..e25479d 100644 --- a/target/linux/generic/patches-3.10/642-bridge_port_isolate.patch +++ b/target/linux/generic/patches-3.10/642-bridge_port_isolate.patch @@ -1,13 +1,13 @@ --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h -@@ -157,6 +157,7 @@ struct net_bridge_port +@@ -171,6 +171,7 @@ struct net_bridge_port #define BR_ROOT_BLOCK 0x00000004 #define BR_MULTICAST_FAST_LEAVE 0x00000008 #define BR_ADMIN_COST 0x00000010 +#define BR_ISOLATE_MODE 0x00000020 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING - u32 multicast_startup_queries_sent; + struct bridge_mcast_query ip4_query; --- a/net/bridge/br_sysfs_if.c +++ b/net/bridge/br_sysfs_if.c @@ -159,6 +159,22 @@ BRPORT_ATTR_FLAG(hairpin_mode, BR_HAIRPI @@ -43,7 +43,7 @@ --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -114,8 +114,8 @@ int br_handle_frame_finish(struct sk_buf +@@ -115,8 +115,8 @@ int br_handle_frame_finish(struct sk_buf skb2 = skb; br->dev->stats.multicast++; |