From: Ben Hutchings <bhutchings@solarflare.com>
Date: Mon, 1 Sep 2008 11:46:54 +0000 (+0100)
Subject: sfc: Set net_device::vlan_features appropriately
X-Git-Tag: v2.6.28-rc1~717^2~364
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=28506563e22a3ec7cf86e5acd853af8e68fe148b;p=linux-2.6-omap-h63xx.git

sfc: Set net_device::vlan_features appropriately

Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
---

diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 7eb11d32deb..022dc366c36 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -2092,6 +2092,9 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev,
 			      NETIF_F_HIGHDMA | NETIF_F_TSO);
 	if (lro)
 		net_dev->features |= NETIF_F_LRO;
+	/* Mask for features that also apply to VLAN devices */
+	net_dev->vlan_features |= (NETIF_F_ALL_CSUM | NETIF_F_SG |
+				   NETIF_F_HIGHDMA);
 	efx = netdev_priv(net_dev);
 	pci_set_drvdata(pci_dev, efx);
 	rc = efx_init_struct(efx, type, pci_dev, net_dev);