aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-08-25 00:47:50 -0400
committerDavid S. Miller <davem@davemloft.net>2009-08-26 18:36:50 -0400
commitcd1da503847a28775f60b959cb7b0123cee2a1a3 (patch)
tree53e5ad6cfd3b8d4fd6d30d978d62722fa48546bb
parent7b25cdbafd757b1255725d4ffb5b1081714b4256 (diff)
igb/ixgbe: add IPV6_CSUM support to vlan_features
We were already exporting TSO6 to the vlan, but we weren't exporting the checksum support for IPV6 which was causing warning messages to be displayed when doing IPv6 TSO over a vlan. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/igb/igb_main.c1
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index fb3273517587..cef4289d5716 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1380,6 +1380,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
1380 netdev->vlan_features |= NETIF_F_TSO; 1380 netdev->vlan_features |= NETIF_F_TSO;
1381 netdev->vlan_features |= NETIF_F_TSO6; 1381 netdev->vlan_features |= NETIF_F_TSO6;
1382 netdev->vlan_features |= NETIF_F_IP_CSUM; 1382 netdev->vlan_features |= NETIF_F_IP_CSUM;
1383 netdev->vlan_features |= NETIF_F_IPV6_CSUM;
1383 netdev->vlan_features |= NETIF_F_SG; 1384 netdev->vlan_features |= NETIF_F_SG;
1384 1385
1385 if (pci_using_dac) 1386 if (pci_using_dac)
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 3f1770690bf0..0bea096e964b 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -5575,6 +5575,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
5575 netdev->vlan_features |= NETIF_F_TSO; 5575 netdev->vlan_features |= NETIF_F_TSO;
5576 netdev->vlan_features |= NETIF_F_TSO6; 5576 netdev->vlan_features |= NETIF_F_TSO6;
5577 netdev->vlan_features |= NETIF_F_IP_CSUM; 5577 netdev->vlan_features |= NETIF_F_IP_CSUM;
5578 netdev->vlan_features |= NETIF_F_IPV6_CSUM;
5578 netdev->vlan_features |= NETIF_F_SG; 5579 netdev->vlan_features |= NETIF_F_SG;
5579 5580
5580 if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) 5581 if (adapter->flags & IXGBE_FLAG_DCB_ENABLED)