aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/070-net_bridge_backports.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-24 20:39:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-24 20:39:36 +0000
commit7004b796658fe274026925f96fd3a6711e8a3f5d (patch)
treef455fb3d2062fd4ca23142c39ca96ea5e2d407fb /target/linux/generic/patches-3.10/070-net_bridge_backports.patch
parent0aca075a9795780062a0b1821e799cd8b1cd5111 (diff)
downloadupstream-7004b796658fe274026925f96fd3a6711e8a3f5d.tar.gz
upstream-7004b796658fe274026925f96fd3a6711e8a3f5d.tar.bz2
upstream-7004b796658fe274026925f96fd3a6711e8a3f5d.zip
kernel: refresh generic 3.10 patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43050
Diffstat (limited to 'target/linux/generic/patches-3.10/070-net_bridge_backports.patch')
-rw-r--r--target/linux/generic/patches-3.10/070-net_bridge_backports.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.10/070-net_bridge_backports.patch b/target/linux/generic/patches-3.10/070-net_bridge_backports.patch
index 6f7e141c5e..f303c3a094 100644
--- a/target/linux/generic/patches-3.10/070-net_bridge_backports.patch
+++ b/target/linux/generic/patches-3.10/070-net_bridge_backports.patch
@@ -555,7 +555,7 @@ Date: Tue May 21 21:52:54 2013 +0000
}
#endif
-@@ -1473,8 +1569,14 @@ static int br_multicast_ipv6_rcv(struct
+@@ -1473,8 +1569,14 @@ static int br_multicast_ipv6_rcv(struct
* - MLD has always Router Alert hop-by-hop option
* - But we do not support jumbrograms.
*/
@@ -918,7 +918,7 @@ Date: Tue May 21 21:52:54 2013 +0000
static ssize_t show_multicast_querier(struct device *d,
struct device_attribute *attr,
char *buf)
-@@ -734,6 +759,7 @@ static struct attribute *bridge_attrs[]
+@@ -734,6 +759,7 @@ static struct attribute *bridge_attrs[]
&dev_attr_multicast_router.attr,
&dev_attr_multicast_snooping.attr,
&dev_attr_multicast_querier.attr,