kernel: refresh 3.8 patches

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 35317
This commit is contained in:
Florian Fainelli 2013-01-24 17:04:52 +00:00
parent 9781461a3d
commit 680f460861
6 changed files with 10 additions and 10 deletions

View file

@ -3175,7 +3175,7 @@
int flags, const char *name,
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5661,6 +5661,13 @@ F: drivers/scsi/osd/
@@ -5667,6 +5667,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_*
F: fs/exofs/

View file

@ -32,7 +32,7 @@
+obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -1246,7 +1246,7 @@ out:
@@ -1243,7 +1243,7 @@ out:
return ret;
}
@ -41,7 +41,7 @@
const struct in6_addr *daddr, unsigned int prefs,
struct in6_addr *saddr)
{
@@ -1371,7 +1371,6 @@ try_nextdev:
@@ -1368,7 +1368,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)
@@ -4949,6 +4948,9 @@ int __init addrconf_init(void)
@@ -4946,6 +4945,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
@ -59,7 +59,7 @@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
@@ -4967,6 +4969,9 @@ void addrconf_cleanup(void)
@@ -4964,6 +4966,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;

View file

@ -1,6 +1,6 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -134,7 +134,7 @@ static inline bool dev_xmit_complete(int
@@ -137,7 +137,7 @@ static inline bool dev_xmit_complete(int
*/
#if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)

View file

@ -1,6 +1,6 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1090,6 +1090,11 @@ struct net_device {
@@ -1093,6 +1093,11 @@ struct net_device {
const struct net_device_ops *netdev_ops;
const struct ethtool_ops *ethtool_ops;
@ -12,7 +12,7 @@
/* Hardware header description */
const struct header_ops *header_ops;
@@ -1146,6 +1151,9 @@ struct net_device {
@@ -1149,6 +1154,9 @@ struct net_device {
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */

View file

@ -830,7 +830,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3500,6 +3500,11 @@ L: linuxppc-dev@lists.ozlabs.org
@@ -3507,6 +3507,11 @@ L: linuxppc-dev@lists.ozlabs.org
S: Odd Fixes
F: drivers/tty/hvc/

View file

@ -265,7 +265,7 @@
static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
@@ -342,6 +343,8 @@ static void __init_memblock memblock_ins
@@ -343,6 +344,8 @@ static void __init_memblock memblock_ins
memblock_set_region_node(rgn, nid);
type->cnt++;
type->total_size += size;