diff options
| author | Sathya Perla <sathyap@serverengines.com> | 2009-08-17 02:58:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-18 02:48:27 +0200 |
| commit | a65027e4d80ece5a5a3bd4fc4808a83208430929 (patch) | |
| tree | f054b4cb0afbc6a3ba235969db353b277b58b9ce /drivers/net/benet | |
| parent | phonet: fix build when PROC_FS is disabled (diff) | |
| download | linux-a65027e4d80ece5a5a3bd4fc4808a83208430929.tar.xz linux-a65027e4d80ece5a5a3bd4fc4808a83208430929.zip | |
be2net: Set mac addr in hw regardless of netif_running()
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>
Diffstat (limited to 'drivers/net/benet')
| -rw-r--r-- | drivers/net/benet/be_main.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 45507d88e6a1..362346045ed3 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -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); } - static int be_mac_addr_set(struct net_device *netdev, void *p) { struct be_adapter *adapter = netdev_priv(netdev); struct sockaddr *addr = p; int status = 0; - if (netif_running(netdev)) { - status = be_cmd_pmac_del(adapter, adapter->if_handle, - adapter->pmac_id); - if (status) - return status; - - status = be_cmd_pmac_add(adapter, (u8 *)addr->sa_data, - adapter->if_handle, &adapter->pmac_id); - } + status = be_cmd_pmac_del(adapter, adapter->if_handle, adapter->pmac_id); + if (status) + return status; + status = be_cmd_pmac_add(adapter, (u8 *)addr->sa_data, + adapter->if_handle, &adapter->pmac_id); if (!status) memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); |