diff options
-rw-r--r-- | drivers/net/ethernet/aeroflex/greth.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/dlink/sundance.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/mv643xx_eth.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/marvell/pxa168_eth.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/s2io.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/pasemi/pasemi_mac.c | 2 | ||||
-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 | ||||
-rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/sun/niu.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/ti/davinci_emac.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/tile/tilepro.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/tundra/tsi108_eth.c | 2 |
18 files changed, 18 insertions, 18 deletions
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c index cfa13481e5f2..348501178089 100644 --- a/drivers/net/ethernet/aeroflex/greth.c +++ b/drivers/net/ethernet/aeroflex/greth.c | |||
@@ -1017,7 +1017,7 @@ static int greth_set_mac_add(struct net_device *dev, void *p) | |||
1017 | regs = (struct greth_regs *) greth->regs; | 1017 | regs = (struct greth_regs *) greth->regs; |
1018 | 1018 | ||
1019 | if (!is_valid_ether_addr(addr->sa_data)) | 1019 | if (!is_valid_ether_addr(addr->sa_data)) |
1020 | return -EINVAL; | 1020 | return -EADDRNOTAVAIL; |
1021 | 1021 | ||
1022 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); | 1022 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
1023 | GRETH_REGSAVE(regs->esa_msb, dev->dev_addr[0] << 8 | dev->dev_addr[1]); | 1023 | GRETH_REGSAVE(regs->esa_msb, dev->dev_addr[0] << 8 | dev->dev_addr[1]); |
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 7105989ba658..8297e2868736 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c | |||
@@ -7773,7 +7773,7 @@ bnx2_change_mac_addr(struct net_device *dev, void *p) | |||
7773 | struct bnx2 *bp = netdev_priv(dev); | 7773 | struct bnx2 *bp = netdev_priv(dev); |
7774 | 7774 | ||
7775 | if (!is_valid_ether_addr(addr->sa_data)) | 7775 | if (!is_valid_ether_addr(addr->sa_data)) |
7776 | return -EINVAL; | 7776 | return -EADDRNOTAVAIL; |
7777 | 7777 | ||
7778 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); | 7778 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
7779 | if (netif_running(dev)) | 7779 | if (netif_running(dev)) |
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index ec5bc3d04333..97dcccdb9eb2 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -8045,7 +8045,7 @@ static int tg3_set_mac_addr(struct net_device *dev, void *p) | |||
8045 | int err = 0, skip_mac_1 = 0; | 8045 | int err = 0, skip_mac_1 = 0; |
8046 | 8046 | ||
8047 | if (!is_valid_ether_addr(addr->sa_data)) | 8047 | if (!is_valid_ether_addr(addr->sa_data)) |
8048 | return -EINVAL; | 8048 | return -EADDRNOTAVAIL; |
8049 | 8049 | ||
8050 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); | 8050 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
8051 | 8051 | ||
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index 857cc254cab8..63bfdd10bd6d 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | |||
@@ -2499,7 +2499,7 @@ static int cxgb_set_mac_addr(struct net_device *dev, void *p) | |||
2499 | struct sockaddr *addr = p; | 2499 | struct sockaddr *addr = p; |
2500 | 2500 | ||
2501 | if (!is_valid_ether_addr(addr->sa_data)) | 2501 | if (!is_valid_ether_addr(addr->sa_data)) |
2502 | return -EINVAL; | 2502 | return -EADDRNOTAVAIL; |
2503 | 2503 | ||
2504 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); | 2504 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
2505 | t3_mac_set_address(&pi->mac, LAN_MAC_IDX, dev->dev_addr); | 2505 | t3_mac_set_address(&pi->mac, LAN_MAC_IDX, dev->dev_addr); |
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index e83d12c7bf20..1d889427073f 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | |||
@@ -2809,7 +2809,7 @@ static int cxgb_set_mac_addr(struct net_device *dev, void *p) | |||
2809 | struct port_info *pi = netdev_priv(dev); | 2809 | struct port_info *pi = netdev_priv(dev); |
2810 | 2810 | ||
2811 | if (!is_valid_ether_addr(addr->sa_data)) | 2811 | if (!is_valid_ether_addr(addr->sa_data)) |
2812 | return -EINVAL; | 2812 | return -EADDRNOTAVAIL; |
2813 | 2813 | ||
2814 | ret = t4_change_mac(pi->adapter, pi->adapter->fn, pi->viid, | 2814 | ret = t4_change_mac(pi->adapter, pi->adapter->fn, pi->viid, |
2815 | pi->xact_addr_filt, addr->sa_data, true, true); | 2815 | pi->xact_addr_filt, addr->sa_data, true, true); |
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c index 9045a451d4a9..3f580c0c28a6 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | |||
@@ -1130,7 +1130,7 @@ static int cxgb4vf_set_mac_addr(struct net_device *dev, void *_addr) | |||
1130 | struct port_info *pi = netdev_priv(dev); | 1130 | struct port_info *pi = netdev_priv(dev); |
1131 | 1131 | ||
1132 | if (!is_valid_ether_addr(addr->sa_data)) | 1132 | if (!is_valid_ether_addr(addr->sa_data)) |
1133 | return -EINVAL; | 1133 | return -EADDRNOTAVAIL; |
1134 | 1134 | ||
1135 | ret = t4vf_change_mac(pi->adapter, pi->viid, pi->xact_addr_filt, | 1135 | ret = t4vf_change_mac(pi->adapter, pi->viid, pi->xact_addr_filt, |
1136 | addr->sa_data, true); | 1136 | addr->sa_data, true); |
diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c index 7227f29ee2ee..d783f4f96ec0 100644 --- a/drivers/net/ethernet/dlink/sundance.c +++ b/drivers/net/ethernet/dlink/sundance.c | |||
@@ -1601,7 +1601,7 @@ static int sundance_set_mac_addr(struct net_device *dev, void *data) | |||
1601 | const struct sockaddr *addr = data; | 1601 | const struct sockaddr *addr = data; |
1602 | 1602 | ||
1603 | if (!is_valid_ether_addr(addr->sa_data)) | 1603 | if (!is_valid_ether_addr(addr->sa_data)) |
1604 | return -EINVAL; | 1604 | return -EADDRNOTAVAIL; |
1605 | memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); | 1605 | memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); |
1606 | __set_mac_addr(dev); | 1606 | __set_mac_addr(dev); |
1607 | 1607 | ||
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index f702d0dc18c7..75af1afe46c8 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c | |||
@@ -1832,7 +1832,7 @@ static int mv643xx_eth_set_mac_address(struct net_device *dev, void *addr) | |||
1832 | struct sockaddr *sa = addr; | 1832 | struct sockaddr *sa = addr; |
1833 | 1833 | ||
1834 | if (!is_valid_ether_addr(sa->sa_data)) | 1834 | if (!is_valid_ether_addr(sa->sa_data)) |
1835 | return -EINVAL; | 1835 | return -EADDRNOTAVAIL; |
1836 | 1836 | ||
1837 | memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN); | 1837 | memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN); |
1838 | 1838 | ||
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index 83e37ad113e0..3a7df0593c68 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c | |||
@@ -627,7 +627,7 @@ static int pxa168_eth_set_mac_address(struct net_device *dev, void *addr) | |||
627 | unsigned char oldMac[ETH_ALEN]; | 627 | unsigned char oldMac[ETH_ALEN]; |
628 | 628 | ||
629 | if (!is_valid_ether_addr(sa->sa_data)) | 629 | if (!is_valid_ether_addr(sa->sa_data)) |
630 | return -EINVAL; | 630 | return -EADDRNOTAVAIL; |
631 | memcpy(oldMac, dev->dev_addr, ETH_ALEN); | 631 | memcpy(oldMac, dev->dev_addr, ETH_ALEN); |
632 | dev->addr_assign_type &= ~NET_ADDR_RANDOM; | 632 | dev->addr_assign_type &= ~NET_ADDR_RANDOM; |
633 | memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN); | 633 | memcpy(dev->dev_addr, sa->sa_data, ETH_ALEN); |
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index 44a6065794c3..22a8de00bf02 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c | |||
@@ -5248,7 +5248,7 @@ static int s2io_set_mac_addr(struct net_device *dev, void *p) | |||
5248 | struct sockaddr *addr = p; | 5248 | struct sockaddr *addr = p; |
5249 | 5249 | ||
5250 | if (!is_valid_ether_addr(addr->sa_data)) | 5250 | if (!is_valid_ether_addr(addr->sa_data)) |
5251 | return -EINVAL; | 5251 | return -EADDRNOTAVAIL; |
5252 | 5252 | ||
5253 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); | 5253 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
5254 | 5254 | ||
diff --git a/drivers/net/ethernet/pasemi/pasemi_mac.c b/drivers/net/ethernet/pasemi/pasemi_mac.c index 667498ea4603..ddc95b0ac78d 100644 --- a/drivers/net/ethernet/pasemi/pasemi_mac.c +++ b/drivers/net/ethernet/pasemi/pasemi_mac.c | |||
@@ -238,7 +238,7 @@ static int pasemi_mac_set_mac_addr(struct net_device *dev, void *p) | |||
238 | unsigned int adr0, adr1; | 238 | unsigned int adr0, adr1; |
239 | 239 | ||
240 | if (!is_valid_ether_addr(addr->sa_data)) | 240 | if (!is_valid_ether_addr(addr->sa_data)) |
241 | return -EINVAL; | 241 | return -EADDRNOTAVAIL; |
242 | 242 | ||
243 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); | 243 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
244 | 244 | ||
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); |
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index c7004dcb5838..1908ba7ca7e6 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c | |||
@@ -1935,7 +1935,7 @@ static int efx_set_mac_address(struct net_device *net_dev, void *data) | |||
1935 | netif_err(efx, drv, efx->net_dev, | 1935 | netif_err(efx, drv, efx->net_dev, |
1936 | "invalid ethernet MAC address requested: %pM\n", | 1936 | "invalid ethernet MAC address requested: %pM\n", |
1937 | new_addr); | 1937 | new_addr); |
1938 | return -EINVAL; | 1938 | return -EADDRNOTAVAIL; |
1939 | } | 1939 | } |
1940 | 1940 | ||
1941 | memcpy(net_dev->dev_addr, new_addr, net_dev->addr_len); | 1941 | memcpy(net_dev->dev_addr, new_addr, net_dev->addr_len); |
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index d83c50816714..c99b3b0e2eae 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c | |||
@@ -6412,7 +6412,7 @@ static int niu_set_mac_addr(struct net_device *dev, void *p) | |||
6412 | unsigned long flags; | 6412 | unsigned long flags; |
6413 | 6413 | ||
6414 | if (!is_valid_ether_addr(addr->sa_data)) | 6414 | if (!is_valid_ether_addr(addr->sa_data)) |
6415 | return -EINVAL; | 6415 | return -EADDRNOTAVAIL; |
6416 | 6416 | ||
6417 | memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); | 6417 | memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); |
6418 | 6418 | ||
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index f053aebbaa06..6d74cb7aaae8 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c | |||
@@ -1254,7 +1254,7 @@ static int emac_dev_setmac_addr(struct net_device *ndev, void *addr) | |||
1254 | struct sockaddr *sa = addr; | 1254 | struct sockaddr *sa = addr; |
1255 | 1255 | ||
1256 | if (!is_valid_ether_addr(sa->sa_data)) | 1256 | if (!is_valid_ether_addr(sa->sa_data)) |
1257 | return -EINVAL; | 1257 | return -EADDRNOTAVAIL; |
1258 | 1258 | ||
1259 | /* Store mac addr in priv and rx channel and set it in EMAC hw */ | 1259 | /* Store mac addr in priv and rx channel and set it in EMAC hw */ |
1260 | memcpy(priv->mac_addr, sa->sa_data, ndev->addr_len); | 1260 | memcpy(priv->mac_addr, sa->sa_data, ndev->addr_len); |
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c index 948c4f2a2d67..261356c2dc99 100644 --- a/drivers/net/ethernet/tile/tilepro.c +++ b/drivers/net/ethernet/tile/tilepro.c | |||
@@ -2186,7 +2186,7 @@ static int tile_net_set_mac_address(struct net_device *dev, void *p) | |||
2186 | struct sockaddr *addr = p; | 2186 | struct sockaddr *addr = p; |
2187 | 2187 | ||
2188 | if (!is_valid_ether_addr(addr->sa_data)) | 2188 | if (!is_valid_ether_addr(addr->sa_data)) |
2189 | return -EINVAL; | 2189 | return -EADDRNOTAVAIL; |
2190 | 2190 | ||
2191 | /* ISSUE: Note that "dev_addr" is now a pointer. */ | 2191 | /* ISSUE: Note that "dev_addr" is now a pointer. */ |
2192 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); | 2192 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c index fc5521c9c089..840e0e9031f5 100644 --- a/drivers/net/ethernet/tundra/tsi108_eth.c +++ b/drivers/net/ethernet/tundra/tsi108_eth.c | |||
@@ -1148,7 +1148,7 @@ static int tsi108_set_mac(struct net_device *dev, void *addr) | |||
1148 | int i; | 1148 | int i; |
1149 | 1149 | ||
1150 | if (!is_valid_ether_addr(addr)) | 1150 | if (!is_valid_ether_addr(addr)) |
1151 | return -EINVAL; | 1151 | return -EADDRNOTAVAIL; |
1152 | 1152 | ||
1153 | for (i = 0; i < 6; i++) | 1153 | for (i = 0; i < 6; i++) |
1154 | /* +2 is for the offset of the HW addr type */ | 1154 | /* +2 is for the offset of the HW addr type */ |