diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-12 19:14:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-12 19:14:22 -0400 |
| commit | 030352a9c7715780b2c01033ae9afe56249bb7cc (patch) | |
| tree | cc23683773d0d63712f4e6ea6824383f1d696e05 /drivers/net/ixgbe | |
| 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/ixgbe')
| -rw-r--r-- | drivers/net/ixgbe/ixgbe_main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 7b859220c255..0d37c9025be4 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -3518,8 +3518,13 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev, | |||
| 3518 | NETIF_F_HW_VLAN_FILTER; | 3518 | NETIF_F_HW_VLAN_FILTER; |
| 3519 | 3519 | ||
| 3520 | netdev->features |= NETIF_F_TSO; | 3520 | netdev->features |= NETIF_F_TSO; |
| 3521 | |||
| 3522 | netdev->features |= NETIF_F_TSO6; | 3521 | netdev->features |= NETIF_F_TSO6; |
| 3522 | |||
| 3523 | netdev->vlan_features |= NETIF_F_TSO; | ||
| 3524 | netdev->vlan_features |= NETIF_F_TSO6; | ||
| 3525 | netdev->vlan_features |= NETIF_F_HW_CSUM; | ||
| 3526 | netdev->vlan_features |= NETIF_F_SG; | ||
| 3527 | |||
| 3523 | if (pci_using_dac) | 3528 | if (pci_using_dac) |
| 3524 | netdev->features |= NETIF_F_HIGHDMA; | 3529 | netdev->features |= NETIF_F_HIGHDMA; |
| 3525 | 3530 | ||