lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

be2net: Set mac addr in hw regardless of netif_running()

Browse Source 
be_mac_addr_set() currently is broken when netif_running() is false.

Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Sathya Perla
2009-08-17 00:58:04 +00:00
committed by David S. Miller
parent ae6e2aef6c
commit a65027e4d8
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/benet/be_main.c
View File

@@ -117,23 +117,18 @@ void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm, u16 num_popped)
iowrite32(val, adapter->db + DB_CQ_OFFSET); iowrite32(val, adapter->db + DB_CQ_OFFSET);
} }
static int be_mac_addr_set(struct net_device *netdev, void *p) static int be_mac_addr_set(struct net_device *netdev, void *p)
{ {
struct be_adapter *adapter = netdev_priv(netdev); struct be_adapter *adapter = netdev_priv(netdev);
struct sockaddr *addr = p; struct sockaddr *addr = p;
int status = 0; int status = 0;
if (netif_running(netdev)) { status = be_cmd_pmac_del(adapter, adapter->if_handle, adapter->pmac_id);
status = be_cmd_pmac_del(adapter, adapter->if_handle,
adapter->pmac_id);
if (status) if (status)
return status; return status;
status = be_cmd_pmac_add(adapter, (u8 *)addr->sa_data, status = be_cmd_pmac_add(adapter, (u8 *)addr->sa_data,
adapter->if_handle, &adapter->pmac_id); adapter->if_handle, &adapter->pmac_id);
}
if (!status) if (!status)
memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);