From c42ea36f1db1492a9e0bc5afa458c512daa69ef1 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Thu, 5 Jun 2008 04:07:28 -0700 Subject: [PATCH] --- yaml --- r: 102888 b: refs/heads/master c: a5136e23b54250f4082130f3dd6f5cb6c54bc7d5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/netdev.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a982fcfa6d93..b8f06e6a939c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48f29ffc509748f5b82d7690561e98f851241a19 +refs/heads/master: a5136e23b54250f4082130f3dd6f5cb6c54bc7d5 diff --git a/trunk/drivers/net/e1000e/netdev.c b/trunk/drivers/net/e1000e/netdev.c index cab1835173cd..ccb8ca2cbb2b 100644 --- a/trunk/drivers/net/e1000e/netdev.c +++ b/trunk/drivers/net/e1000e/netdev.c @@ -4343,6 +4343,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev, netdev->features |= NETIF_F_TSO; netdev->features |= NETIF_F_TSO6; + netdev->vlan_features |= NETIF_F_TSO; + netdev->vlan_features |= NETIF_F_TSO6; + netdev->vlan_features |= NETIF_F_HW_CSUM; + netdev->vlan_features |= NETIF_F_SG; + if (pci_using_dac) netdev->features |= NETIF_F_HIGHDMA;