diff options
-rw-r--r-- | drivers/net/ethernet/8390/etherh.c | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/cadence/at91_ether.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/cadence/macb.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/dnet.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/i825xx/ether1.c | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/micrel/ks8695net.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/nxp/lpc_eth.c | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/seeq/ether3.c | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smc911x.c | 10 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smc91x.c | 10 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 5 | ||||
-rw-r--r-- | drivers/net/ethernet/wiznet/w5100.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/wiznet/w5300.c | 2 |
13 files changed, 1 insertions, 62 deletions
diff --git a/drivers/net/ethernet/8390/etherh.c b/drivers/net/ethernet/8390/etherh.c index 8322c54972f..6414e84516c 100644 --- a/drivers/net/ethernet/8390/etherh.c +++ b/drivers/net/ethernet/8390/etherh.c | |||
@@ -463,12 +463,6 @@ etherh_open(struct net_device *dev) | |||
463 | { | 463 | { |
464 | struct ei_device *ei_local = netdev_priv(dev); | 464 | struct ei_device *ei_local = netdev_priv(dev); |
465 | 465 | ||
466 | if (!is_valid_ether_addr(dev->dev_addr)) { | ||
467 | printk(KERN_WARNING "%s: invalid ethernet MAC address\n", | ||
468 | dev->name); | ||
469 | return -EINVAL; | ||
470 | } | ||
471 | |||
472 | if (request_irq(dev->irq, __ei_interrupt, 0, dev->name, dev)) | 466 | if (request_irq(dev->irq, __ei_interrupt, 0, dev->name, dev)) |
473 | return -EAGAIN; | 467 | return -EAGAIN; |
474 | 468 | ||
diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c index e7a476cff6c..716cc014a56 100644 --- a/drivers/net/ethernet/cadence/at91_ether.c +++ b/drivers/net/ethernet/cadence/at91_ether.c | |||
@@ -97,9 +97,6 @@ static int at91ether_open(struct net_device *dev) | |||
97 | u32 ctl; | 97 | u32 ctl; |
98 | int ret; | 98 | int ret; |
99 | 99 | ||
100 | if (!is_valid_ether_addr(dev->dev_addr)) | ||
101 | return -EADDRNOTAVAIL; | ||
102 | |||
103 | /* Clear internal statistics */ | 100 | /* Clear internal statistics */ |
104 | ctl = macb_readl(lp, NCR); | 101 | ctl = macb_readl(lp, NCR); |
105 | macb_writel(lp, NCR, ctl | MACB_BIT(CLRSTAT)); | 102 | macb_writel(lp, NCR, ctl | MACB_BIT(CLRSTAT)); |
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 27991ddb6ff..cc6e593dd65 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c | |||
@@ -1215,9 +1215,6 @@ static int macb_open(struct net_device *dev) | |||
1215 | if (!bp->phy_dev) | 1215 | if (!bp->phy_dev) |
1216 | return -EAGAIN; | 1216 | return -EAGAIN; |
1217 | 1217 | ||
1218 | if (!is_valid_ether_addr(dev->dev_addr)) | ||
1219 | return -EADDRNOTAVAIL; | ||
1220 | |||
1221 | err = macb_alloc_consistent(bp); | 1218 | err = macb_alloc_consistent(bp); |
1222 | if (err) { | 1219 | if (err) { |
1223 | netdev_err(dev, "Unable to allocate DMA memory (error %d)\n", | 1220 | netdev_err(dev, "Unable to allocate DMA memory (error %d)\n", |
diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c index 290b26f868c..feb5095d81b 100644 --- a/drivers/net/ethernet/dnet.c +++ b/drivers/net/ethernet/dnet.c | |||
@@ -664,9 +664,6 @@ static int dnet_open(struct net_device *dev) | |||
664 | if (!bp->phy_dev) | 664 | if (!bp->phy_dev) |
665 | return -EAGAIN; | 665 | return -EAGAIN; |
666 | 666 | ||
667 | if (!is_valid_ether_addr(dev->dev_addr)) | ||
668 | return -EADDRNOTAVAIL; | ||
669 | |||
670 | napi_enable(&bp->napi); | 667 | napi_enable(&bp->napi); |
671 | dnet_init_hw(bp); | 668 | dnet_init_hw(bp); |
672 | 669 | ||
diff --git a/drivers/net/ethernet/i825xx/ether1.c b/drivers/net/ethernet/i825xx/ether1.c index 067db3f13e9..7b9609da6fe 100644 --- a/drivers/net/ethernet/i825xx/ether1.c +++ b/drivers/net/ethernet/i825xx/ether1.c | |||
@@ -638,12 +638,6 @@ ether1_txalloc (struct net_device *dev, int size) | |||
638 | static int | 638 | static int |
639 | ether1_open (struct net_device *dev) | 639 | ether1_open (struct net_device *dev) |
640 | { | 640 | { |
641 | if (!is_valid_ether_addr(dev->dev_addr)) { | ||
642 | printk(KERN_WARNING "%s: invalid ethernet MAC address\n", | ||
643 | dev->name); | ||
644 | return -EINVAL; | ||
645 | } | ||
646 | |||
647 | if (request_irq(dev->irq, ether1_interrupt, 0, "ether1", dev)) | 641 | if (request_irq(dev->irq, ether1_interrupt, 0, "ether1", dev)) |
648 | return -EAGAIN; | 642 | return -EAGAIN; |
649 | 643 | ||
diff --git a/drivers/net/ethernet/micrel/ks8695net.c b/drivers/net/ethernet/micrel/ks8695net.c index dccae1d1743..e62c31234cf 100644 --- a/drivers/net/ethernet/micrel/ks8695net.c +++ b/drivers/net/ethernet/micrel/ks8695net.c | |||
@@ -1249,9 +1249,6 @@ ks8695_open(struct net_device *ndev) | |||
1249 | struct ks8695_priv *ksp = netdev_priv(ndev); | 1249 | struct ks8695_priv *ksp = netdev_priv(ndev); |
1250 | int ret; | 1250 | int ret; |
1251 | 1251 | ||
1252 | if (!is_valid_ether_addr(ndev->dev_addr)) | ||
1253 | return -EADDRNOTAVAIL; | ||
1254 | |||
1255 | ks8695_reset(ksp); | 1252 | ks8695_reset(ksp); |
1256 | 1253 | ||
1257 | ks8695_update_mac(ksp); | 1254 | ks8695_update_mac(ksp); |
diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c index af8b4142088..db6e1019be1 100644 --- a/drivers/net/ethernet/nxp/lpc_eth.c +++ b/drivers/net/ethernet/nxp/lpc_eth.c | |||
@@ -1219,9 +1219,6 @@ static int lpc_eth_open(struct net_device *ndev) | |||
1219 | if (netif_msg_ifup(pldat)) | 1219 | if (netif_msg_ifup(pldat)) |
1220 | dev_dbg(&pldat->pdev->dev, "enabling %s\n", ndev->name); | 1220 | dev_dbg(&pldat->pdev->dev, "enabling %s\n", ndev->name); |
1221 | 1221 | ||
1222 | if (!is_valid_ether_addr(ndev->dev_addr)) | ||
1223 | return -EADDRNOTAVAIL; | ||
1224 | |||
1225 | __lpc_eth_clock_enable(pldat, true); | 1222 | __lpc_eth_clock_enable(pldat, true); |
1226 | 1223 | ||
1227 | /* Reset and initialize */ | 1224 | /* Reset and initialize */ |
@@ -1301,6 +1298,7 @@ static const struct net_device_ops lpc_netdev_ops = { | |||
1301 | .ndo_set_rx_mode = lpc_eth_set_multicast_list, | 1298 | .ndo_set_rx_mode = lpc_eth_set_multicast_list, |
1302 | .ndo_do_ioctl = lpc_eth_ioctl, | 1299 | .ndo_do_ioctl = lpc_eth_ioctl, |
1303 | .ndo_set_mac_address = lpc_set_mac_address, | 1300 | .ndo_set_mac_address = lpc_set_mac_address, |
1301 | .ndo_validate_addr = eth_validate_addr, | ||
1304 | .ndo_change_mtu = eth_change_mtu, | 1302 | .ndo_change_mtu = eth_change_mtu, |
1305 | }; | 1303 | }; |
1306 | 1304 | ||
diff --git a/drivers/net/ethernet/seeq/ether3.c b/drivers/net/ethernet/seeq/ether3.c index 6a40dd03a32..72a01748d1b 100644 --- a/drivers/net/ethernet/seeq/ether3.c +++ b/drivers/net/ethernet/seeq/ether3.c | |||
@@ -399,12 +399,6 @@ ether3_probe_bus_16(struct net_device *dev, int val) | |||
399 | static int | 399 | static int |
400 | ether3_open(struct net_device *dev) | 400 | ether3_open(struct net_device *dev) |
401 | { | 401 | { |
402 | if (!is_valid_ether_addr(dev->dev_addr)) { | ||
403 | printk(KERN_WARNING "%s: invalid ethernet MAC address\n", | ||
404 | dev->name); | ||
405 | return -EINVAL; | ||
406 | } | ||
407 | |||
408 | if (request_irq(dev->irq, ether3_interrupt, 0, "ether3", dev)) | 402 | if (request_irq(dev->irq, ether3_interrupt, 0, "ether3", dev)) |
409 | return -EAGAIN; | 403 | return -EAGAIN; |
410 | 404 | ||
diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c index 8d15f7a74b4..990f57467a1 100644 --- a/drivers/net/ethernet/smsc/smc911x.c +++ b/drivers/net/ethernet/smsc/smc911x.c | |||
@@ -1400,16 +1400,6 @@ smc911x_open(struct net_device *dev) | |||
1400 | 1400 | ||
1401 | DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__); | 1401 | DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__); |
1402 | 1402 | ||
1403 | /* | ||
1404 | * Check that the address is valid. If its not, refuse | ||
1405 | * to bring the device up. The user must specify an | ||
1406 | * address using ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx | ||
1407 | */ | ||
1408 | if (!is_valid_ether_addr(dev->dev_addr)) { | ||
1409 | PRINTK("%s: no valid ethernet hw addr\n", __func__); | ||
1410 | return -EINVAL; | ||
1411 | } | ||
1412 | |||
1413 | /* reset the hardware */ | 1403 | /* reset the hardware */ |
1414 | smc911x_reset(dev); | 1404 | smc911x_reset(dev); |
1415 | 1405 | ||
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index 318adc935a5..f516e5a71c5 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c | |||
@@ -1474,16 +1474,6 @@ smc_open(struct net_device *dev) | |||
1474 | 1474 | ||
1475 | DBG(2, "%s: %s\n", dev->name, __func__); | 1475 | DBG(2, "%s: %s\n", dev->name, __func__); |
1476 | 1476 | ||
1477 | /* | ||
1478 | * Check that the address is valid. If its not, refuse | ||
1479 | * to bring the device up. The user must specify an | ||
1480 | * address using ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx | ||
1481 | */ | ||
1482 | if (!is_valid_ether_addr(dev->dev_addr)) { | ||
1483 | PRINTK("%s: no valid ethernet hw addr\n", __func__); | ||
1484 | return -EINVAL; | ||
1485 | } | ||
1486 | |||
1487 | /* Setup the default Register Modes */ | 1477 | /* Setup the default Register Modes */ |
1488 | lp->tcr_cur_mode = TCR_DEFAULT; | 1478 | lp->tcr_cur_mode = TCR_DEFAULT; |
1489 | lp->rcr_cur_mode = RCR_DEFAULT; | 1479 | lp->rcr_cur_mode = RCR_DEFAULT; |
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index c53c0f4e2ce..cc025620b68 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c | |||
@@ -1463,11 +1463,6 @@ static int smsc911x_open(struct net_device *dev) | |||
1463 | return -EAGAIN; | 1463 | return -EAGAIN; |
1464 | } | 1464 | } |
1465 | 1465 | ||
1466 | if (!is_valid_ether_addr(dev->dev_addr)) { | ||
1467 | SMSC_WARN(pdata, hw, "dev_addr is not a valid MAC address"); | ||
1468 | return -EADDRNOTAVAIL; | ||
1469 | } | ||
1470 | |||
1471 | /* Reset the LAN911x */ | 1466 | /* Reset the LAN911x */ |
1472 | if (smsc911x_soft_reset(pdata)) { | 1467 | if (smsc911x_soft_reset(pdata)) { |
1473 | SMSC_WARN(pdata, hw, "soft reset failed"); | 1468 | SMSC_WARN(pdata, hw, "soft reset failed"); |
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c index 2c08bf6e7bf..7daf92e56b6 100644 --- a/drivers/net/ethernet/wiznet/w5100.c +++ b/drivers/net/ethernet/wiznet/w5100.c | |||
@@ -580,8 +580,6 @@ static int w5100_open(struct net_device *ndev) | |||
580 | struct w5100_priv *priv = netdev_priv(ndev); | 580 | struct w5100_priv *priv = netdev_priv(ndev); |
581 | 581 | ||
582 | netif_info(priv, ifup, ndev, "enabling\n"); | 582 | netif_info(priv, ifup, ndev, "enabling\n"); |
583 | if (!is_valid_ether_addr(ndev->dev_addr)) | ||
584 | return -EINVAL; | ||
585 | w5100_hw_start(priv); | 583 | w5100_hw_start(priv); |
586 | napi_enable(&priv->napi); | 584 | napi_enable(&priv->napi); |
587 | netif_start_queue(ndev); | 585 | netif_start_queue(ndev); |
diff --git a/drivers/net/ethernet/wiznet/w5300.c b/drivers/net/ethernet/wiznet/w5300.c index 88943d90c76..bd9eec676a5 100644 --- a/drivers/net/ethernet/wiznet/w5300.c +++ b/drivers/net/ethernet/wiznet/w5300.c | |||
@@ -500,8 +500,6 @@ static int w5300_open(struct net_device *ndev) | |||
500 | struct w5300_priv *priv = netdev_priv(ndev); | 500 | struct w5300_priv *priv = netdev_priv(ndev); |
501 | 501 | ||
502 | netif_info(priv, ifup, ndev, "enabling\n"); | 502 | netif_info(priv, ifup, ndev, "enabling\n"); |
503 | if (!is_valid_ether_addr(ndev->dev_addr)) | ||
504 | return -EINVAL; | ||
505 | w5300_hw_start(priv); | 503 | w5300_hw_start(priv); |
506 | napi_enable(&priv->napi); | 504 | napi_enable(&priv->napi); |
507 | netif_start_queue(ndev); | 505 | netif_start_queue(ndev); |