aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-04-18 21:02:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-18 21:02:35 -0400
commit334d094504c2fe1c44211ecb49146ae6bca8c321 (patch)
treed3c0f68e4b9f8e3d2ccc39e7dfe5de0534a5fad9 /arch
parentd1a4be630fb068f251d64b62919f143c49ca8057 (diff)
parentd1643d24c61b725bef399cc1cf2944b4c9c23177 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.26: (1090 commits) [NET]: Fix and allocate less memory for ->priv'less netdevices [IPV6]: Fix dangling references on error in fib6_add(). [NETLABEL]: Fix NULL deref in netlbl_unlabel_staticlist_gen() if ifindex not found [PKT_SCHED]: Fix datalen check in tcf_simp_init(). [INET]: Uninline the __inet_inherit_port call. [INET]: Drop the inet_inherit_port() call. SCTP: Initialize partial_bytes_acked to 0, when all of the data is acked. [netdrvr] forcedeth: internal simplifications; changelog removal phylib: factor out get_phy_id from within get_phy_device PHY: add BCM5464 support to broadcom PHY driver cxgb3: Fix __must_check warning with dev_dbg. tc35815: Statistics cleanup natsemi: fix MMIO for PPC 44x platforms [TIPC]: Cleanup of TIPC reference table code [TIPC]: Optimized initialization of TIPC reference table [TIPC]: Remove inlining of reference table locking routines e1000: convert uint16_t style integers to u16 ixgb: convert uint16_t style integers to u16 sb1000.c: make const arrays static sb1000.c: stop inlining largish static functions ...
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/hp/sim/simeth.c2
-rw-r--r--arch/powerpc/platforms/82xx/ep8248e.c2
-rw-r--r--arch/powerpc/platforms/pasemi/gpio_mdio.c2
-rw-r--r--arch/powerpc/sysdev/fsl_soc.c5
-rw-r--r--arch/s390/defconfig8
5 files changed, 9 insertions, 10 deletions
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index 969fe9f443c4..3d47839a0c48 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -294,7 +294,7 @@ simeth_device_event(struct notifier_block *this,unsigned long event, void *ptr)
294 return NOTIFY_DONE; 294 return NOTIFY_DONE;
295 } 295 }
296 296
297 if (dev->nd_net != &init_net) 297 if (dev_net(dev) != &init_net)
298 return NOTIFY_DONE; 298 return NOTIFY_DONE;
299 299
300 if ( event != NETDEV_UP && event != NETDEV_DOWN ) return NOTIFY_DONE; 300 if ( event != NETDEV_UP && event != NETDEV_DOWN ) return NOTIFY_DONE;
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index ba93d8ae9b0c..d5770fdf7f09 100644
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -138,7 +138,7 @@ static int __devinit ep8248e_mdio_probe(struct of_device *ofdev,
138 138
139 bus->name = "ep8248e-mdio-bitbang"; 139 bus->name = "ep8248e-mdio-bitbang";
140 bus->dev = &ofdev->dev; 140 bus->dev = &ofdev->dev;
141 bus->id = res.start; 141 snprintf(bus->id, MII_BUS_ID_SIZE, "%x", res.start);
142 142
143 return mdiobus_register(bus); 143 return mdiobus_register(bus);
144} 144}
diff --git a/arch/powerpc/platforms/pasemi/gpio_mdio.c b/arch/powerpc/platforms/pasemi/gpio_mdio.c
index b46542990cf8..ab6955412ba4 100644
--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
+++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c
@@ -241,7 +241,7 @@ static int __devinit gpio_mdio_probe(struct of_device *ofdev,
241 new_bus->reset = &gpio_mdio_reset; 241 new_bus->reset = &gpio_mdio_reset;
242 242
243 prop = of_get_property(np, "reg", NULL); 243 prop = of_get_property(np, "reg", NULL);
244 new_bus->id = *prop; 244 snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", *prop);
245 new_bus->priv = priv; 245 new_bus->priv = priv;
246 246
247 new_bus->phy_mask = 0; 247 new_bus->phy_mask = 0;
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 2c5388ce902a..3581416905ea 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -341,7 +341,7 @@ static int __init gfar_of_init(void)
341 goto unreg; 341 goto unreg;
342 } 342 }
343 343
344 gfar_data.bus_id = 0; 344 snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "0");
345 gfar_data.phy_id = fixed_link[0]; 345 gfar_data.phy_id = fixed_link[0];
346 } else { 346 } else {
347 phy = of_find_node_by_phandle(*ph); 347 phy = of_find_node_by_phandle(*ph);
@@ -362,7 +362,8 @@ static int __init gfar_of_init(void)
362 } 362 }
363 363
364 gfar_data.phy_id = *id; 364 gfar_data.phy_id = *id;
365 gfar_data.bus_id = res.start; 365 snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%x",
366 res.start);
366 367
367 of_node_put(phy); 368 of_node_put(phy);
368 of_node_put(mdio); 369 of_node_put(mdio);
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index dcc3ec2ef643..a72f208e62d0 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -538,11 +538,9 @@ CONFIG_CTC=m
538# CONFIG_SMSGIUCV is not set 538# CONFIG_SMSGIUCV is not set
539# CONFIG_CLAW is not set 539# CONFIG_CLAW is not set
540CONFIG_QETH=y 540CONFIG_QETH=y
541 541CONFIG_QETH_L2=y
542# 542CONFIG_QETH_L3=y
543# Gigabit Ethernet default settings 543CONFIG_QETH_IPV6=y
544#
545# CONFIG_QETH_IPV6 is not set
546CONFIG_CCWGROUP=y 544CONFIG_CCWGROUP=y
547# CONFIG_PPP is not set 545# CONFIG_PPP is not set
548# CONFIG_SLIP is not set 546# CONFIG_SLIP is not set