Re: [PATCH] natsemi update 1/4 Use assigned MAC address

[Manfred Spraul <manfred@colorfullife.com>]

[-- Attachment #1: Type: text/plain, Size: 1318 bytes --]

Gary N Spiess wrote:

>Jeff,
>This is the first of a series of patches needed to support our product using the DP83815.
>This patch accepts the MAC address as a parameter because our implementation does not have an EEPROM.  I tried to upgrade to the new module_param_array() macro, but couldn't find a tutorial on the new param scheme.
>
Ok. Appending "natsemi.ethaddr=00:01:02:04:05:06" works.

>  To get things working for our development, I use a __setup() wrapper to get "ethaddr=" from the linux command line.
>  
>
That's not a reason to merge a hack

>+       if (find_cnt < ethaddr_num)
>  
>
I think we should add a special case: if strlen(ethaddr[find_cnt]) is 0, 
then the address from the eeprom is used - this allows to replace one 
mac address if multiple nics are installed.

>+       {
>  
>
Coding style: the { should be in the same line as the if

>+               int i, a[6];
>  
>
i already exists, no need to define another instance.

I've appended an updated patch - could you test it?

But: I'm not sure that the change is required. What about just setting 
the mac to 0, and the actual mac address is set from user space? It's 
possible to set the mac address with

# ifconfig eth2 ether 80:01:02:03:04:05

Is there a reason why you cannot set the mac address from user space?

--
    Manfred

[-- Attachment #2: natsemi-2.6.6-1.patch-new --]
[-- Type: text/plain, Size: 2189 bytes --]

--- 2.6/drivers/net/natsemi.c	2004-05-10 04:31:59.000000000 +0200
+++ build-2.6/drivers/net/natsemi.c	2004-06-06 15:27:12.124436291 +0200
@@ -147,6 +147,7 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/timer.h>
@@ -209,6 +210,8 @@
 #define MAX_UNITS 8		/* More are supported, limit only on options */
 static int options[MAX_UNITS];
 static int full_duplex[MAX_UNITS];
+static char *ethaddr[MAX_UNITS] = {NULL, };
+static int ethaddr_num = 0;
 
 /* Operational parameters that are set at compile time. */
 
@@ -256,6 +259,7 @@
 MODULE_PARM(rx_copybreak, "i");
 MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i");
 MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i");
+module_param_array(ethaddr, charp, ethaddr_num, S_IRUGO);
 MODULE_PARM_DESC(max_interrupt_work, 
 	"DP8381x maximum events handled per interrupt");
 MODULE_PARM_DESC(mtu, "DP8381x MTU (all boards)");
@@ -265,6 +269,7 @@
 MODULE_PARM_DESC(options, 
 	"DP8381x: Bits 0-3: media type, bit 17: full duplex");
 MODULE_PARM_DESC(full_duplex, "DP8381x full duplex setting(s) (1)");
+MODULE_PARM_DESC(ethaddr, "DP8381x MAC addr(s) xx:xx:xx:xx:xx:xx");
 
 /*
 				Theory of Operation
@@ -776,13 +781,21 @@
 		goto err_ioremap;
 	}
 
-	/* Work around the dropped serial bit. */
-	prev_eedata = eeprom_read(ioaddr, 6);
-	for (i = 0; i < 3; i++) {
-		int eedata = eeprom_read(ioaddr, i + 7);
-		dev->dev_addr[i*2] = (eedata << 1) + (prev_eedata >> 15);
-		dev->dev_addr[i*2+1] = eedata >> 7;
-		prev_eedata = eedata;
+	if (find_cnt < ethaddr_num && strlen(ethaddr[find_cnt]) > 0) {
+		int a[6];
+		sscanf(ethaddr[find_cnt], "%2x:%2x:%2x:%2x:%2x:%2x",
+			&a[0], &a[1], &a[2], &a[3], &a[4], &a[5]);
+		for (i = 6; i--; )
+			dev->dev_addr[i] = (unsigned char)a[i];
+	} else {
+		/* Work around the dropped serial bit. */
+		prev_eedata = eeprom_read(ioaddr, 6);
+		for (i = 0; i < 3; i++) {
+			int eedata = eeprom_read(ioaddr, i + 7);
+			dev->dev_addr[i*2] = (eedata << 1) + (prev_eedata >> 15);
+			dev->dev_addr[i*2+1] = eedata >> 7;
+			prev_eedata = eedata;
+		}
 	}
 
 	dev->base_addr = ioaddr;