diff options
| author | John Crispin <john@openwrt.org> | 2014-06-26 13:47:46 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-06-26 13:47:46 +0000 |
| commit | fbf8b288e1f318cb697f4a86cbe01b4b9573b82d (patch) | |
| tree | b955ff887aea2a971b9f6a69c12330b085791107 /target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch | |
| parent | 994e5ce2f93bf8beeb099a9fd38d1dc358005c30 (diff) | |
| download | upstream-fbf8b288e1f318cb697f4a86cbe01b4b9573b82d.tar.gz upstream-fbf8b288e1f318cb697f4a86cbe01b4b9573b82d.tar.bz2 upstream-fbf8b288e1f318cb697f4a86cbe01b4b9573b82d.zip | |
kernel: refresh generic patches
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 41352
Diffstat (limited to 'target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch index 4e34d51855..407c980e01 100644 --- a/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch @@ -32,7 +32,7 @@ +obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c -@@ -1319,7 +1319,7 @@ out: +@@ -1322,7 +1322,7 @@ out: return ret; } @@ -41,7 +41,7 @@ const struct in6_addr *daddr, unsigned int prefs, struct in6_addr *saddr) { -@@ -1444,7 +1444,6 @@ try_nextdev: +@@ -1447,7 +1447,6 @@ try_nextdev: in6_ifa_put(hiscore->ifa); return 0; } @@ -49,7 +49,7 @@ int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, unsigned char banned_flags) -@@ -5170,6 +5169,9 @@ int __init addrconf_init(void) +@@ -5173,6 +5172,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -59,7 +59,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -5188,6 +5190,9 @@ void addrconf_cleanup(void) +@@ -5191,6 +5193,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; |