projects
/
15.05
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update kernel 3.18 to rc4
[15.05/openwrt.git]
/
target
/
linux
/
generic
/
patches-3.18
/
643-bridge_remove_ipv6_dependency.patch
diff --git
a/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch
b/target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch
index
e5af533
..
e8b21e5
100644
(file)
--- a/
target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch
+++ b/
target/linux/generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch
@@
-52,7
+52,7
@@
int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
u32 banned_flags)
int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr,
u32 banned_flags)
-@@ -543
3,6 +5432
,9 @@ int __init addrconf_init(void)
+@@ -543
4,6 +5433
,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
ipv6_addr_label_rtnl_register();
@@
-62,7
+62,7
@@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
-@@ -545
2,6 +5454
,9 @@ void addrconf_cleanup(void)
+@@ -545
3,6 +5455
,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;
struct net_device *dev;
int i;