|
@@ -25,11 +25,6 @@
|
|
|
#include "net_kern.h"
|
|
|
#include "net_user.h"
|
|
|
|
|
|
-static inline void set_ether_mac(struct net_device *dev, unsigned char *addr)
|
|
|
-{
|
|
|
- memcpy(dev->dev_addr, addr, ETH_ALEN);
|
|
|
-}
|
|
|
-
|
|
|
#define DRIVER_NAME "uml-netdev"
|
|
|
|
|
|
static DEFINE_SPINLOCK(opened_lock);
|
|
@@ -266,7 +261,7 @@ static int uml_net_set_mac(struct net_device *dev, void *addr)
|
|
|
struct sockaddr *hwaddr = addr;
|
|
|
|
|
|
spin_lock_irq(&lp->lock);
|
|
|
- set_ether_mac(dev, hwaddr->sa_data);
|
|
|
+ eth_mac_addr(dev, hwaddr->sa_data);
|
|
|
spin_unlock_irq(&lp->lock);
|
|
|
|
|
|
return 0;
|
|
@@ -380,7 +375,6 @@ static const struct net_device_ops uml_netdev_ops = {
|
|
|
.ndo_tx_timeout = uml_net_tx_timeout,
|
|
|
.ndo_set_mac_address = uml_net_set_mac,
|
|
|
.ndo_change_mtu = uml_net_change_mtu,
|
|
|
- .ndo_set_mac_address = eth_mac_addr,
|
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
|
};
|
|
|
|
|
@@ -478,7 +472,7 @@ static void eth_configure(int n, void *init, char *mac,
|
|
|
((*transport->user->init)(&lp->user, dev) != 0))
|
|
|
goto out_unregister;
|
|
|
|
|
|
- set_ether_mac(dev, device->mac);
|
|
|
+ eth_mac_addr(dev, device->mac);
|
|
|
dev->mtu = transport->user->mtu;
|
|
|
dev->netdev_ops = ¨_netdev_ops;
|
|
|
dev->ethtool_ops = ¨_net_ethtool_ops;
|