From df9cb2c4d0c0fc71b6148b6d8adfe0ab3aed317f Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sun, 4 May 2008 01:34:31 -0700 Subject: [PATCH] --- yaml --- r: 96063 b: refs/heads/master c: be0c007ac64f880a946995d6d1fc654acc81484d h: refs/heads/master i: 96061: 8cffeaee1b18ec3cd15644902a53b3b6fe1d4aef 96059: 8f292ff63398e0913d62354a64a455e25b65b861 96055: 9e351f3dba8f2e3a3add12ea48a0dccd5434adb6 96047: bc5d189f90ee077510db64a0a59065836722253e 96031: 8b4dc17a41b75e007c3e47b70fbaa1afcf7dbf88 95999: 05c48517ab6f2a8e7d18139beebb466e53d61431 v: v3 --- [refs] | 2 +- trunk/drivers/net/niu.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 540cfa3d58d7..f3fc196b16c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e544ff00da4b53069dbca3debbfb02d455f72467 +refs/heads/master: be0c007ac64f880a946995d6d1fc654acc81484d diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c index 4009c4ce96b4..57cfd72ffdf7 100644 --- a/trunk/drivers/net/niu.c +++ b/trunk/drivers/net/niu.c @@ -1,6 +1,6 @@ /* niu.c: Neptune ethernet driver. * - * Copyright (C) 2007 David S. Miller (davem@davemloft.net) + * Copyright (C) 2007, 2008 David S. Miller (davem@davemloft.net) */ #include @@ -33,8 +33,8 @@ #define DRV_MODULE_NAME "niu" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "0.8" -#define DRV_MODULE_RELDATE "April 24, 2008" +#define DRV_MODULE_VERSION "0.9" +#define DRV_MODULE_RELDATE "May 4, 2008" static char version[] __devinitdata = DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; @@ -7264,8 +7264,11 @@ static int __devinit niu_get_and_validate_port(struct niu *np) parent->num_ports = nr64(ESPC_NUM_PORTS_MACS) & ESPC_NUM_PORTS_MACS_VAL; + /* All of the current probing methods fail on + * Maramba on-board parts. + */ if (!parent->num_ports) - return -ENODEV; + parent->num_ports = 4; } } }