Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[mv-sheeva.git] / drivers / net / veth.c

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 4f93a55aaaa5378954ec35e1a9bfec81ccd5b550..108bbbeacfb61a956223094160715344894b7b2e 100644 (file)
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -263,9 +263,11 @@ static void veth_dev_free(struct net_device *dev)
 }
 
 static const struct net_device_ops veth_netdev_ops = {
-       .ndo_init       = veth_dev_init,
-       .ndo_open       = veth_open,
-       .ndo_get_stats  = veth_get_stats,
+       .ndo_init            = veth_dev_init,
+       .ndo_open            = veth_open,
+       .ndo_start_xmit      = veth_xmit,
+       .ndo_get_stats       = veth_get_stats,
+       .ndo_set_mac_address = eth_mac_addr,
 };
 
 static void veth_setup(struct net_device *dev)
@@ -273,7 +275,6 @@ static void veth_setup(struct net_device *dev)
        ether_setup(dev);
 
        dev->netdev_ops = &veth_netdev_ops;
-       dev->hard_start_xmit = veth_xmit;
        dev->ethtool_ops = &veth_ethtool_ops;
        dev->features |= NETIF_F_LLTX;
        dev->destructor = veth_dev_free;