From bca6d144735e058bec565b54832b9531d9787fa8 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Sat, 11 Oct 2008 12:25:59 -0700 Subject: [PATCH] --- yaml --- r: 112976 b: refs/heads/master c: 20501a69818827884b4381cdcedefdb5e7892915 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000/e1000_main.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index fb732b77a164..0f66ec57e882 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bb82d924536cfa62db73dd381b07d9e9b084ffa +refs/heads/master: 20501a69818827884b4381cdcedefdb5e7892915 diff --git a/trunk/drivers/net/e1000/e1000_main.c b/trunk/drivers/net/e1000/e1000_main.c index 3bafaede7916..fac82152e4c8 100644 --- a/trunk/drivers/net/e1000/e1000_main.c +++ b/trunk/drivers/net/e1000/e1000_main.c @@ -1047,6 +1047,11 @@ static int __devinit e1000_probe(struct pci_dev *pdev, netdev->features |= NETIF_F_LLTX; + 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; + adapter->en_mng_pt = e1000_enable_mng_pass_thru(hw); /* initialize eeprom parameters */