patch-2.4.22 linux-2.4.22/drivers/net/cs89x0.c
Next file: linux-2.4.22/drivers/net/dgrs.c
Previous file: linux-2.4.22/drivers/net/bonding.c
Back to the patch index
Back to the overall index
- Lines: 25
- Date:
2003-08-25 04:44:42.000000000 -0700
- Orig file:
linux-2.4.21/drivers/net/cs89x0.c
- Orig date:
2002-08-02 17:39:44.000000000 -0700
diff -urN linux-2.4.21/drivers/net/cs89x0.c linux-2.4.22/drivers/net/cs89x0.c
@@ -1629,16 +1629,21 @@
}
-static int set_mac_address(struct net_device *dev, void *addr)
+static int set_mac_address(struct net_device *dev, void *p)
{
int i;
+ struct sockaddr *addr = p;
+
if (netif_running(dev))
return -EBUSY;
+
+ memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
+
if (net_debug) {
printk("%s: Setting MAC address to ", dev->name);
- for (i = 0; i < 6; i++)
- printk(" %2.2x", dev->dev_addr[i] = ((unsigned char *)addr)[i]);
+ for (i = 0; i < dev->addr_len; i++)
+ printk(" %2.2x", dev->dev_addr[i]);
printk(".\n");
}
/* set the Ethernet address */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)