net/ethernet: remove useless is_valid_ether_addr from drivers ndo_open
If ndo_validate_addr is set to the generic eth_validate_addr function there is no point in calling is_valid_ether_addr from driver ndo_open if ndo_open is not used elsewhere in the driver. With this change is_valid_ether_addr will be called from the generic eth_validate_addr function. So there should be no change in the actual behavior. Signed-off-by: Joachim Eastwood <manabian@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
ae4b46e9d7
commit
c867b55eb4
|
@ -463,12 +463,6 @@ etherh_open(struct net_device *dev)
|
|||
{
|
||||
struct ei_device *ei_local = netdev_priv(dev);
|
||||
|
||||
if (!is_valid_ether_addr(dev->dev_addr)) {
|
||||
printk(KERN_WARNING "%s: invalid ethernet MAC address\n",
|
||||
dev->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (request_irq(dev->irq, __ei_interrupt, 0, dev->name, dev))
|
||||
return -EAGAIN;
|
||||
|
||||
|
|
|
@ -97,9 +97,6 @@ static int at91ether_open(struct net_device *dev)
|
|||
u32 ctl;
|
||||
int ret;
|
||||
|
||||
if (!is_valid_ether_addr(dev->dev_addr))
|
||||
return -EADDRNOTAVAIL;
|
||||
|
||||
/* Clear internal statistics */
|
||||
ctl = macb_readl(lp, NCR);
|
||||
macb_writel(lp, NCR, ctl | MACB_BIT(CLRSTAT));
|
||||
|
|
|
@ -1215,9 +1215,6 @@ static int macb_open(struct net_device *dev)
|
|||
if (!bp->phy_dev)
|
||||
return -EAGAIN;
|
||||
|
||||
if (!is_valid_ether_addr(dev->dev_addr))
|
||||
return -EADDRNOTAVAIL;
|
||||
|
||||
err = macb_alloc_consistent(bp);
|
||||
if (err) {
|
||||
netdev_err(dev, "Unable to allocate DMA memory (error %d)\n",
|
||||
|
|
|
@ -664,9 +664,6 @@ static int dnet_open(struct net_device *dev)
|
|||
if (!bp->phy_dev)
|
||||
return -EAGAIN;
|
||||
|
||||
if (!is_valid_ether_addr(dev->dev_addr))
|
||||
return -EADDRNOTAVAIL;
|
||||
|
||||
napi_enable(&bp->napi);
|
||||
dnet_init_hw(bp);
|
||||
|
||||
|
|
|
@ -638,12 +638,6 @@ ether1_txalloc (struct net_device *dev, int size)
|
|||
static int
|
||||
ether1_open (struct net_device *dev)
|
||||
{
|
||||
if (!is_valid_ether_addr(dev->dev_addr)) {
|
||||
printk(KERN_WARNING "%s: invalid ethernet MAC address\n",
|
||||
dev->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (request_irq(dev->irq, ether1_interrupt, 0, "ether1", dev))
|
||||
return -EAGAIN;
|
||||
|
||||
|
|
|
@ -1249,9 +1249,6 @@ ks8695_open(struct net_device *ndev)
|
|||
struct ks8695_priv *ksp = netdev_priv(ndev);
|
||||
int ret;
|
||||
|
||||
if (!is_valid_ether_addr(ndev->dev_addr))
|
||||
return -EADDRNOTAVAIL;
|
||||
|
||||
ks8695_reset(ksp);
|
||||
|
||||
ks8695_update_mac(ksp);
|
||||
|
|
|
@ -1219,9 +1219,6 @@ static int lpc_eth_open(struct net_device *ndev)
|
|||
if (netif_msg_ifup(pldat))
|
||||
dev_dbg(&pldat->pdev->dev, "enabling %s\n", ndev->name);
|
||||
|
||||
if (!is_valid_ether_addr(ndev->dev_addr))
|
||||
return -EADDRNOTAVAIL;
|
||||
|
||||
__lpc_eth_clock_enable(pldat, true);
|
||||
|
||||
/* Reset and initialize */
|
||||
|
@ -1301,6 +1298,7 @@ static const struct net_device_ops lpc_netdev_ops = {
|
|||
.ndo_set_rx_mode = lpc_eth_set_multicast_list,
|
||||
.ndo_do_ioctl = lpc_eth_ioctl,
|
||||
.ndo_set_mac_address = lpc_set_mac_address,
|
||||
.ndo_validate_addr = eth_validate_addr,
|
||||
.ndo_change_mtu = eth_change_mtu,
|
||||
};
|
||||
|
||||
|
|
|
@ -399,12 +399,6 @@ ether3_probe_bus_16(struct net_device *dev, int val)
|
|||
static int
|
||||
ether3_open(struct net_device *dev)
|
||||
{
|
||||
if (!is_valid_ether_addr(dev->dev_addr)) {
|
||||
printk(KERN_WARNING "%s: invalid ethernet MAC address\n",
|
||||
dev->name);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (request_irq(dev->irq, ether3_interrupt, 0, "ether3", dev))
|
||||
return -EAGAIN;
|
||||
|
||||
|
|
|
@ -1400,16 +1400,6 @@ smc911x_open(struct net_device *dev)
|
|||
|
||||
DBG(SMC_DEBUG_FUNC, "%s: --> %s\n", dev->name, __func__);
|
||||
|
||||
/*
|
||||
* Check that the address is valid. If its not, refuse
|
||||
* to bring the device up. The user must specify an
|
||||
* address using ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx
|
||||
*/
|
||||
if (!is_valid_ether_addr(dev->dev_addr)) {
|
||||
PRINTK("%s: no valid ethernet hw addr\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* reset the hardware */
|
||||
smc911x_reset(dev);
|
||||
|
||||
|
|
|
@ -1474,16 +1474,6 @@ smc_open(struct net_device *dev)
|
|||
|
||||
DBG(2, "%s: %s\n", dev->name, __func__);
|
||||
|
||||
/*
|
||||
* Check that the address is valid. If its not, refuse
|
||||
* to bring the device up. The user must specify an
|
||||
* address using ifconfig eth0 hw ether xx:xx:xx:xx:xx:xx
|
||||
*/
|
||||
if (!is_valid_ether_addr(dev->dev_addr)) {
|
||||
PRINTK("%s: no valid ethernet hw addr\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Setup the default Register Modes */
|
||||
lp->tcr_cur_mode = TCR_DEFAULT;
|
||||
lp->rcr_cur_mode = RCR_DEFAULT;
|
||||
|
|
|
@ -1463,11 +1463,6 @@ static int smsc911x_open(struct net_device *dev)
|
|||
return -EAGAIN;
|
||||
}
|
||||
|
||||
if (!is_valid_ether_addr(dev->dev_addr)) {
|
||||
SMSC_WARN(pdata, hw, "dev_addr is not a valid MAC address");
|
||||
return -EADDRNOTAVAIL;
|
||||
}
|
||||
|
||||
/* Reset the LAN911x */
|
||||
if (smsc911x_soft_reset(pdata)) {
|
||||
SMSC_WARN(pdata, hw, "soft reset failed");
|
||||
|
|
|
@ -580,8 +580,6 @@ static int w5100_open(struct net_device *ndev)
|
|||
struct w5100_priv *priv = netdev_priv(ndev);
|
||||
|
||||
netif_info(priv, ifup, ndev, "enabling\n");
|
||||
if (!is_valid_ether_addr(ndev->dev_addr))
|
||||
return -EINVAL;
|
||||
w5100_hw_start(priv);
|
||||
napi_enable(&priv->napi);
|
||||
netif_start_queue(ndev);
|
||||
|
|
|
@ -500,8 +500,6 @@ static int w5300_open(struct net_device *ndev)
|
|||
struct w5300_priv *priv = netdev_priv(ndev);
|
||||
|
||||
netif_info(priv, ifup, ndev, "enabling\n");
|
||||
if (!is_valid_ether_addr(ndev->dev_addr))
|
||||
return -EINVAL;
|
||||
w5300_hw_start(priv);
|
||||
napi_enable(&priv->napi);
|
||||
netif_start_queue(ndev);
|
||||
|
|
Loading…
Reference in New Issue