Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 183334
b: refs/heads/master
c: d649a28
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and David S. Miller committed Dec 30, 2009
1 parent 2505c56 commit 4825fda
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 753cdc3304f0612766a81cddab9d8af01fcf8218
refs/heads/master: d649a2844e49ece6309cf28cb941ef64eb69228f
7 changes: 2 additions & 5 deletions trunk/drivers/net/usb/rtl8150.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,20 +313,17 @@ static int rtl8150_set_mac_address(struct net_device *netdev, void *p)
{
struct sockaddr *addr = p;
rtl8150_t *dev = netdev_priv(netdev);
int i;

if (netif_running(netdev))
return -EBUSY;

memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
dbg("%s: Setting MAC address to ", netdev->name);
for (i = 0; i < 5; i++)
dbg("%02X:", netdev->dev_addr[i]);
dbg("%02X\n", netdev->dev_addr[i]);
dbg("%s: Setting MAC address to %pM\n", netdev->name, netdev->dev_addr);
/* Set the IDR registers. */
set_registers(dev, IDR, netdev->addr_len, netdev->dev_addr);
#ifdef EEPROM_WRITE
{
int i;
u8 cr;
/* Get the CR contents. */
get_registers(dev, CR, 1, &cr);
Expand Down

0 comments on commit 4825fda

Please sign in to comment.