From 24e611a8181a3f0419791ee5846d6fcb3090b883 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Sat, 29 Dec 2012 16:26:10 +0000 Subject: [PATCH] --- yaml --- r: 351224 b: refs/heads/master c: 8093315a91340bca52549044975d8c7f673b28a1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/veth.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 033885d77422..576a10f874be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2681128f0ced8aa4e66f221197e183cc16d244fe +refs/heads/master: 8093315a91340bca52549044975d8c7f673b28a1 diff --git a/trunk/drivers/net/veth.c b/trunk/drivers/net/veth.c index c048f8d27bbf..8b2e11238efa 100644 --- a/trunk/drivers/net/veth.c +++ b/trunk/drivers/net/veth.c @@ -238,6 +238,10 @@ static const struct net_device_ops veth_netdev_ops = { .ndo_set_mac_address = eth_mac_addr, }; +#define VETH_FEATURES (NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_ALL_TSO | \ + NETIF_F_HW_CSUM | NETIF_F_RXCSUM | NETIF_F_HIGHDMA | \ + NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX) + static void veth_setup(struct net_device *dev) { ether_setup(dev); @@ -248,9 +252,10 @@ static void veth_setup(struct net_device *dev) dev->netdev_ops = &veth_netdev_ops; dev->ethtool_ops = &veth_ethtool_ops; dev->features |= NETIF_F_LLTX; + dev->features |= VETH_FEATURES; dev->destructor = veth_dev_free; - dev->hw_features = NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_RXCSUM; + dev->hw_features = VETH_FEATURES; } /*