Skip to content

Commit

Permalink
dm9601: tell HW about random generated mac address
Browse files Browse the repository at this point in the history
Otherwise unicast RX will only work in promisc mode.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Wu Fengguang authored and David S. Miller committed Jan 8, 2009
1 parent 684f217 commit 4b9f8ec
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/net/usb/dm9601.c
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,11 @@ static void dm9601_set_multicast(struct net_device *net)
dm_write_reg_async(dev, DM_RX_CTRL, rx_ctl);
}

static void __dm9601_set_mac_address(struct usbnet *dev)
{
dm_write_async(dev, DM_PHY_ADDR, ETH_ALEN, dev->net->dev_addr);
}

static int dm9601_set_mac_address(struct net_device *net, void *p)
{
struct sockaddr *addr = p;
Expand All @@ -406,7 +411,7 @@ static int dm9601_set_mac_address(struct net_device *net, void *p)
return -EINVAL;

memcpy(net->dev_addr, addr->sa_data, net->addr_len);
dm_write_async(dev, DM_PHY_ADDR, net->addr_len, net->dev_addr);
__dm9601_set_mac_address(dev);

return 0;
}
Expand Down Expand Up @@ -450,6 +455,8 @@ static int dm9601_bind(struct usbnet *dev, struct usb_interface *intf)
*/
if (is_valid_ether_addr(mac))
memcpy(dev->net->dev_addr, mac, ETH_ALEN);
else
__dm9601_set_mac_address(dev);

/* power up phy */
dm_write_reg(dev, DM_GPR_CTRL, 1);
Expand Down

0 comments on commit 4b9f8ec

Please sign in to comment.