summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.2
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic/patches-3.2')
-rw-r--r--target/linux/generic/patches-3.2/440-block2mtd_init.patch4
-rw-r--r--target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch8
-rw-r--r--target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch2
3 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/generic/patches-3.2/440-block2mtd_init.patch b/target/linux/generic/patches-3.2/440-block2mtd_init.patch
index 53979b267..513fbcadb 100644
--- a/target/linux/generic/patches-3.2/440-block2mtd_init.patch
+++ b/target/linux/generic/patches-3.2/440-block2mtd_init.patch
@@ -106,8 +106,8 @@
{
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
-@@ -664,6 +664,7 @@ rescan:
- kfree(state);
+@@ -696,6 +696,7 @@ int invalidate_partitions(struct gendisk
+
return 0;
}
+EXPORT_SYMBOL(rescan_partitions);
diff --git a/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch
index 9203e0174..6b79e5463 100644
--- a/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.2/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
-@@ -1107,7 +1107,7 @@ out:
+@@ -1111,7 +1111,7 @@ out:
return ret;
}
@@ -41,7 +41,7 @@
const struct in6_addr *daddr, unsigned int prefs,
struct in6_addr *saddr)
{
-@@ -1232,7 +1232,6 @@ try_nextdev:
+@@ -1236,7 +1236,6 @@ try_nextdev:
in6_ifa_put(hiscore->ifa);
return 0;
}
@@ -49,7 +49,7 @@
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
unsigned char banned_flags)
-@@ -4814,6 +4813,9 @@ int __init addrconf_init(void)
+@@ -4818,6 +4817,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
@@ -59,7 +59,7 @@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
-@@ -4832,6 +4834,9 @@ void addrconf_cleanup(void)
+@@ -4836,6 +4838,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;
diff --git a/target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch
index 06b05f8af..91139854b 100644
--- a/target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch
@@ -100,7 +100,7 @@
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
-@@ -824,7 +824,7 @@ static void __br_multicast_send_query(st
+@@ -827,7 +827,7 @@ static void __br_multicast_send_query(st
if (port) {
__skb_push(skb, sizeof(struct ethhdr));
skb->dev = port->dev;