Downgrade one of the MAC validity checks. If it's one that could be
possibly assigned to a physical NIC, then nothing will break. So,
emit a warning in this case, but keep the requested MAC.
Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
---
arch/um/drivers/net_kern.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
Index: linux-2.6-git/arch/um/drivers/net_kern.c
===================================================================
--- linux-2.6-git.orig/arch/um/drivers/net_kern.c 2008-01-02
13:16:19.000000000 -0500
+++ linux-2.6-git/arch/um/drivers/net_kern.c 2008-01-02 15:37:02.000000000
-0500
@@ -318,7 +318,7 @@ static void setup_etheraddr(char *str, u
if (str == NULL)
goto random;
- for (i = 0;i < 6; i++) {
+ for (i = 0; i < 6; i++) {
addr[i] = simple_strtoul(str, &end, 16);
if ((end == str) ||
((*end != ':') && (*end != ',') && (*end != '\0'))) {
@@ -343,14 +343,13 @@ static void setup_etheraddr(char *str, u
}
if (!is_local_ether_addr(addr)) {
printk(KERN_WARNING
- "Warning: attempt to assign a globally valid ethernet "
+ "Warning: Assigning a globally valid ethernet "
"address to a device\n");
- printk(KERN_WARNING "You should better enable the 2nd "
- "rightmost bit in the first byte of the MAC,\n");
+ printk(KERN_WARNING "You should set the 2nd rightmost bit in "
+ "the first byte of the MAC,\n");
printk(KERN_WARNING "i.e. %02x:%02x:%02x:%02x:%02x:%02x\n",
addr[0] | 0x02, addr[1], addr[2], addr[3], addr[4],
addr[5]);
- goto random;
}
return;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
