diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2015-07-11 19:58:44 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2015-07-11 19:58:44 +0000 |
| commit | 18748aea45fab91571285ad03b6a507deafad421 (patch) | |
| tree | 19ec7cf9cf31f3a0c857938d94130d58b159cb3d /target/linux/generic/patches-3.18/051-02-bridge-allow-setting-hash_max-multicast_router-if-in.patch | |
| parent | 5da5af14ddffb02d4f181e92f240a7de7cca321c (diff) | |
| download | master-187ad058-18748aea45fab91571285ad03b6a507deafad421.tar.gz master-187ad058-18748aea45fab91571285ad03b6a507deafad421.tar.bz2 master-187ad058-18748aea45fab91571285ad03b6a507deafad421.zip | |
kernel: update 3.18 to 3.18.18
Changelog:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.18
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46299 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.18/051-02-bridge-allow-setting-hash_max-multicast_router-if-in.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/051-02-bridge-allow-setting-hash_max-multicast_router-if-in.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.18/051-02-bridge-allow-setting-hash_max-multicast_router-if-in.patch b/target/linux/generic/patches-3.18/051-02-bridge-allow-setting-hash_max-multicast_router-if-in.patch index c899c10cff..f7f88f8134 100644 --- a/target/linux/generic/patches-3.18/051-02-bridge-allow-setting-hash_max-multicast_router-if-in.patch +++ b/target/linux/generic/patches-3.18/051-02-bridge-allow-setting-hash_max-multicast_router-if-in.patch @@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c -@@ -1949,11 +1949,9 @@ out: +@@ -1948,11 +1948,9 @@ out: int br_multicast_set_router(struct net_bridge *br, unsigned long val) { @@ -39,7 +39,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> switch (val) { case 0: -@@ -1964,13 +1962,8 @@ int br_multicast_set_router(struct net_b +@@ -1963,13 +1961,8 @@ int br_multicast_set_router(struct net_b br->multicast_router = val; err = 0; break; @@ -53,7 +53,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> spin_unlock_bh(&br->multicast_lock); return err; -@@ -1979,11 +1972,9 @@ unlock: +@@ -1978,11 +1971,9 @@ unlock: int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val) { struct net_bridge *br = p->br; @@ -66,7 +66,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> switch (val) { case 0: -@@ -2005,13 +1996,8 @@ int br_multicast_set_port_router(struct +@@ -2004,13 +1995,8 @@ int br_multicast_set_port_router(struct br_multicast_add_router(br, p); break; @@ -80,7 +80,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> spin_unlock(&br->multicast_lock); return err; -@@ -2116,15 +2102,11 @@ unlock: +@@ -2115,15 +2101,11 @@ unlock: int br_multicast_set_hash_max(struct net_bridge *br, unsigned long val) { |