patch-2.4.21 linux-2.4.21/drivers/net/tokenring/smctr.c
Next file: linux-2.4.21/drivers/net/tulip/21142.c
Previous file: linux-2.4.21/drivers/net/tokenring/olympic.c
Back to the patch index
Back to the overall index
- Lines: 33
- Date:
2003-06-13 07:51:35.000000000 -0700
- Orig file:
linux-2.4.20/drivers/net/tokenring/smctr.c
- Orig date:
2001-09-13 16:04:43.000000000 -0700
diff -urN linux-2.4.20/drivers/net/tokenring/smctr.c linux-2.4.21/drivers/net/tokenring/smctr.c
@@ -3101,28 +3101,12 @@
unsigned int i;
__u8 r;
- /* Check if node address has been specified by user. (non-0) */
- for(i = 0; ((i < 6) && (dev->dev_addr[i] == 0)); i++);
+ for(i = 0; i < 6; i++)
{
- if(i != 6)
- {
- for(i = 0; i < 6; i++)
- {
- r = inb(ioaddr + LAR0 + i);
- dev->dev_addr[i] = (char)r;
- }
- dev->addr_len = 6;
- }
- else /* Node addr. not given by user, read it from board. */
- {
- for(i = 0; i < 6; i++)
- {
- r = inb(ioaddr + LAR0 + i);
- dev->dev_addr[i] = (char)r;
- }
- dev->addr_len = 6;
- }
+ r = inb(ioaddr + LAR0 + i);
+ dev->dev_addr[i] = (char)r;
}
+ dev->addr_len = 6;
return (0);
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)