diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-12 16:14:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-12 16:14:22 -0700 |
| commit | 030352a9c7715780b2c01033ae9afe56249bb7cc (patch) | |
| tree | cc23683773d0d63712f4e6ea6824383f1d696e05 /drivers/net/e1000e/netdev.c | |
| parent | e6e30add6bd8115af108de2a13ec82d997a55777 (diff) | |
| parent | 0c1aa20fb87b796d904f4d89ad12e5a0c483127b (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index cab1835173c..ccb8ca2cbb2 100644 --- a/drivers/net/e1000e/netdev.c +++ b/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; |