diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-25 15:19:06 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-25 15:29:35 +1000 |
| commit | 349c8b953872211cdd9e6907b89ba7f29fc15219 (patch) | |
| tree | 0cf54c254246e4f4edb67766d135357b042eb09d /drivers/net/e1000e/netdev.c | |
| parent | 728d140439c3941e6f4735a7d62f029b07befa7c (diff) | |
| parent | e35c3269edba151e1c703d87068a28ce2cd65bb0 (diff) | |
Merge commit 'net/master'
Conflicts:
Documentation/powerpc/booting-without-of.txt
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 cab1835173cd..ccb8ca2cbb2b 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; |