diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-19 18:23:31 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-03-19 18:23:31 +0000 |
| commit | c1dc6df8bd19306f1b7981cc28618bb8ffce8697 (patch) | |
| tree | e9bfa33203f0a4f3484fad690bb2626e7438ff15 /target/linux/generic | |
| parent | f86e4123891689ddfd3b6112ac3dacaefeb5a536 (diff) | |
| download | upstream-c1dc6df8bd19306f1b7981cc28618bb8ffce8697.tar.gz upstream-c1dc6df8bd19306f1b7981cc28618bb8ffce8697.tar.bz2 upstream-c1dc6df8bd19306f1b7981cc28618bb8ffce8697.zip | |
kernel: update linux 3.2 to 3.2.12
SVN-Revision: 31028
Diffstat (limited to 'target/linux/generic')
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 53979b267a..513fbcadbb 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 9203e01742..6b79e5463d 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 06b05f8af9..91139854bb 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; |