diff options
Diffstat (limited to 'drivers/net/ethernet/smsc')
-rw-r--r-- | drivers/net/ethernet/smsc/smc911x.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smc91x.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/drivers/net/ethernet/smsc/smc911x.c b/drivers/net/ethernet/smsc/smc911x.c index 9778cba9fc74..e88df9c7f1c0 100644 --- a/drivers/net/ethernet/smsc/smc911x.c +++ b/drivers/net/ethernet/smsc/smc911x.c | |||
@@ -1927,9 +1927,6 @@ static int smc911x_probe(struct net_device *dev) | |||
1927 | } | 1927 | } |
1928 | dev->irq = irq_canonicalize(dev->irq); | 1928 | dev->irq = irq_canonicalize(dev->irq); |
1929 | 1929 | ||
1930 | /* Fill in the fields of the device structure with ethernet values. */ | ||
1931 | ether_setup(dev); | ||
1932 | |||
1933 | dev->netdev_ops = &smc911x_netdev_ops; | 1930 | dev->netdev_ops = &smc911x_netdev_ops; |
1934 | dev->watchdog_timeo = msecs_to_jiffies(watchdog); | 1931 | dev->watchdog_timeo = msecs_to_jiffies(watchdog); |
1935 | dev->ethtool_ops = &smc911x_ethtool_ops; | 1932 | dev->ethtool_ops = &smc911x_ethtool_ops; |
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c index bcaa41af1e62..5e94d00b96b3 100644 --- a/drivers/net/ethernet/smsc/smc91x.c +++ b/drivers/net/ethernet/smsc/smc91x.c | |||
@@ -1967,9 +1967,6 @@ static int smc_probe(struct net_device *dev, void __iomem *ioaddr, | |||
1967 | } | 1967 | } |
1968 | dev->irq = irq_canonicalize(dev->irq); | 1968 | dev->irq = irq_canonicalize(dev->irq); |
1969 | 1969 | ||
1970 | /* Fill in the fields of the device structure with ethernet values. */ | ||
1971 | ether_setup(dev); | ||
1972 | |||
1973 | dev->watchdog_timeo = msecs_to_jiffies(watchdog); | 1970 | dev->watchdog_timeo = msecs_to_jiffies(watchdog); |
1974 | dev->netdev_ops = &smc_netdev_ops; | 1971 | dev->netdev_ops = &smc_netdev_ops; |
1975 | dev->ethtool_ops = &smc_ethtool_ops; | 1972 | dev->ethtool_ops = &smc_ethtool_ops; |
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 5e13fa5524ae..affb29da353e 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c | |||
@@ -2255,7 +2255,6 @@ static int smsc911x_init(struct net_device *dev) | |||
2255 | if (smsc911x_soft_reset(pdata)) | 2255 | if (smsc911x_soft_reset(pdata)) |
2256 | return -ENODEV; | 2256 | return -ENODEV; |
2257 | 2257 | ||
2258 | ether_setup(dev); | ||
2259 | dev->flags |= IFF_MULTICAST; | 2258 | dev->flags |= IFF_MULTICAST; |
2260 | netif_napi_add(dev, &pdata->napi, smsc911x_poll, SMSC_NAPI_WEIGHT); | 2259 | netif_napi_add(dev, &pdata->napi, smsc911x_poll, SMSC_NAPI_WEIGHT); |
2261 | dev->netdev_ops = &smsc911x_netdev_ops; | 2260 | dev->netdev_ops = &smsc911x_netdev_ops; |