Re: [RFC] Patch to option HSO driver to the kernel

[Paulius Zaleckas <paulius.zaleckas-Ft0m5Q12RQ9xBelEqimL3w@public.gmane.org>]

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

Paulius Zaleckas wrote:
> Reworked MAC address generation from USB serial number
> Now it is very similar to the one done in the cdc_ether.c
> 
> Filip: Does the dummy MAC address have to start with 0xFA?
> 

Hopefully fixed last bug in MAC address generation.
Patch against latest Greg unified patch.
Don't use my previous patch.

[-- Attachment #2: hso_mac_gen_2.patch --]
[-- Type: text/x-patch, Size: 2481 bytes --]

--- linux-2.6-hso/drivers/net/usb/hso.c	2008-04-16 10:58:01.000000000 +0300
+++ linux-2.6-hso-my/drivers/net/usb/hso.c	2008-04-16 12:06:19.000000000 +0300
@@ -315,7 +315,6 @@ static int hso_get_activity(struct hso_d
 /* convert a character representing a hex value to a number */
 static unsigned char hex2dec(unsigned char digit)
 {
-
 	if ((digit >= '0') && (digit <= '9'))
 		return (digit - '0');
 	/* Map all characters to 0-15 */
@@ -323,7 +322,7 @@ static unsigned char hex2dec(unsigned ch
 		return (digit - 'a' + 10) % 16;
 	if ((digit >= 'A') && (digit <= 'Z'))
 		return (digit - 'A' + 10) % 16;
-	return 16;
+	return 0;
 }
 
 #define SIOCSETRADIO   (SIOCDEVPRIVATE+4)
@@ -2308,7 +2307,6 @@ static void set_ethernet_addr(struct hso
 	int i = 0;
 	int len = 0;
 	unsigned char buffer[13];
-	unsigned char checkserial[7] = "Serial";
 
 	/* we can't fail, therefor we use a random macaddress */
 	random_ether_addr(mac_addr);
@@ -2324,27 +2322,14 @@ static void set_ethernet_addr(struct hso
 	len = usb_string(odev->parent->usb,
 			 odev->parent->usb->descriptor.iSerialNumber,
 			 buffer, 13);
-	if (len != 12) {
-		/* some devices don't have the serial filled in, checking ... */
+	if (len != 12 && strcmp("Serial", buffer)) {
+		/* Fill in the mac_addr */
 		for (i = 0; i < 6; i++) {
-			if (buffer[i] != checkserial[i]) {
-				/* Fill in the mac_addr */
-				for (i = 2; i < 6; i++) {
-					if ((16 == buffer[2 * i]) ||
-					    (16 == buffer[2 * i + 1])) {
-						dev_err(&odev->parent->usb->dev,
-							"Bad value in MAC "
-							"address i:%d\n", i);
-					} else {
-						mac_addr[i] =
-						    (hex2dec(buffer[2 * i]) <<
-						     4) + hex2dec(buffer[2 * i +
-									 1]);
-					}
-				}
-				break;
-			}
+			mac_addr[i] = (hex2dec(buffer[2 * i]) << 4) +
+				       hex2dec(buffer[2 * i + 1]);
 		}
+		mac_addr[0] &= 0xfe;	/* clear multicast bit */
+		mac_addr[0] |= 0x02;	/* set local assignment bit (IEEE802) */
 	} else {
 		dev_err(&odev->parent->usb->dev, "Attempting to get MAC "
 			"address failed: using random\n");
@@ -3200,7 +3185,7 @@ module_param(debug, int, S_IRUGO | S_IWU
 MODULE_PARM_DESC(tty_major, "Set the major tty number");
 module_param(tty_major, int, S_IRUGO | S_IWUSR);
 
-/* set the major tty number (eg: insmod hso.ko tty_major=245) */
+/* disable network interface (eg: insmod hso.ko disable_net=1) */
 MODULE_PARM_DESC(disable_net, "Disable the network interface");
 module_param(disable_net, int, S_IRUGO | S_IWUSR);