Merge branch 'core/percpu' into x86/paravirt

[linux-2.6-omap-h63xx.git] / drivers / net / veth.c

diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 4f93a55aaaa5378954ec35e1a9bfec81ccd5b550..852d0e7c4e62abbfb13421664293dd70182c4126 100644 (file)
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -265,6 +265,7 @@ 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_start_xmit = veth_xmit,
        .ndo_get_stats  = veth_get_stats,
 };
 
@@ -273,7 +274,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;