diff options
author | Danny Kukawka <danny.kukawka@bisect.de> | 2012-02-20 21:07:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-23 17:03:20 -0500 |
commit | 504f9b5a6bb5336ad434438d0cdd61a16db80129 (patch) | |
tree | 307356c1d47a8300fd4973159edaad130c5cda9f /drivers/net/ethernet/qlogic | |
parent | 32d219ed61a97f6591a941e23673b2c1dd8628e7 (diff) |
ethernet: unify return value of .ndo_set_mac_address if address is invalid
Unify return value of .ndo_set_mac_address if the given address
isn't valid. Return -EADDRNOTAVAIL as eth_mac_addr() already does
if is_valid_ether_addr() fails.
Signed-off-by: Danny Kukawka <danny.kukawka@bisect.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic')
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 8dc4a134dece..7648995ea720 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | |||
@@ -518,7 +518,7 @@ static int netxen_nic_set_mac(struct net_device *netdev, void *p) | |||
518 | struct sockaddr *addr = p; | 518 | struct sockaddr *addr = p; |
519 | 519 | ||
520 | if (!is_valid_ether_addr(addr->sa_data)) | 520 | if (!is_valid_ether_addr(addr->sa_data)) |
521 | return -EINVAL; | 521 | return -EADDRNOTAVAIL; |
522 | 522 | ||
523 | if (netif_running(netdev)) { | 523 | if (netif_running(netdev)) { |
524 | netif_device_detach(netdev); | 524 | netif_device_detach(netdev); |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index dba95311a462..81bb1a69e69f 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
@@ -301,7 +301,7 @@ static int qlcnic_set_mac(struct net_device *netdev, void *p) | |||
301 | return -EOPNOTSUPP; | 301 | return -EOPNOTSUPP; |
302 | 302 | ||
303 | if (!is_valid_ether_addr(addr->sa_data)) | 303 | if (!is_valid_ether_addr(addr->sa_data)) |
304 | return -EINVAL; | 304 | return -EADDRNOTAVAIL; |
305 | 305 | ||
306 | if (test_bit(__QLCNIC_DEV_UP, &adapter->state)) { | 306 | if (test_bit(__QLCNIC_DEV_UP, &adapter->state)) { |
307 | netif_device_detach(netdev); | 307 | netif_device_detach(netdev); |