From 5d823c725d09bd2beee36db489c4fad5ebcc5d73 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Tue, 31 Mar 2015 19:21:13 +0000 Subject: generic/3.18: upgrade to 3.18.10 Signed-off-by: Imre Kaloz git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45197 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic/patches-3.18/643-bridge_remove_ipv6_dependency.patch | 4 ++-- target/linux/generic/patches-3.18/701-phy_extension.patch | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/generic') 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 e8b21e5060..3f0dcd3ae2 100644 --- 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) -@@ -5434,6 +5433,9 @@ int __init addrconf_init(void) +@@ -5451,6 +5450,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -62,7 +62,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -5453,6 +5455,9 @@ void addrconf_cleanup(void) +@@ -5470,6 +5472,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; diff --git a/target/linux/generic/patches-3.18/701-phy_extension.patch b/target/linux/generic/patches-3.18/701-phy_extension.patch index 6da486bb27..5c63dbec62 100644 --- a/target/linux/generic/patches-3.18/701-phy_extension.patch +++ b/target/linux/generic/patches-3.18/701-phy_extension.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -338,6 +338,50 @@ int phy_ethtool_gset(struct phy_device * +@@ -357,6 +357,50 @@ int phy_ethtool_gset(struct phy_device * } EXPORT_SYMBOL(phy_ethtool_gset); -- cgit v1.2.3