From 0547c32da42854cb220272ce8d40ea2f4f64e95c Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Fri, 6 Feb 2009 23:18:27 +0000
Subject: [PATCH] --- yaml --- r: 134335 b: refs/heads/master c:
 7d8eb29e6eae9cc13e1975daf28d2ae789c1f110 h: refs/heads/master i:   134333:
 83e4c186ce98f432bb5a4eb1ea39ce91799a6990   134331:
 e1a5ce35b2306dbd8913f6c11375f4a75cb54eae   134327:
 3cc2fb32d75467ff959d192746f072453861c4eb   134319:
 a869175f954f8a14ac8d8084c5cc4d2ae10b45a9   134303:
 ddbb1258476e2c1a9eb78d54fb64ac4df14c3790   134271:
 c79aadfede3c75b8df8e89038998253c80600ab9 v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/net/igb/igb_ethtool.c | 16 +++++++---------
 trunk/drivers/net/igb/igb_main.c    |  5 +++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 882ead0a5ebb..91acacdfe764 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fbe67af3ee1928f7eae273133b7112d1665d4d3
+refs/heads/master: 7d8eb29e6eae9cc13e1975daf28d2ae789c1f110
diff --git a/trunk/drivers/net/igb/igb_ethtool.c b/trunk/drivers/net/igb/igb_ethtool.c
index 84be46c2a0f9..d7bdc6c16d0e 100644
--- a/trunk/drivers/net/igb/igb_ethtool.c
+++ b/trunk/drivers/net/igb/igb_ethtool.c
@@ -287,15 +287,15 @@ static int igb_set_rx_csum(struct net_device *netdev, u32 data)
 
 static u32 igb_get_tx_csum(struct net_device *netdev)
 {
-	return (netdev->features & NETIF_F_HW_CSUM) != 0;
+	return (netdev->features & NETIF_F_IP_CSUM) != 0;
 }
 
 static int igb_set_tx_csum(struct net_device *netdev, u32 data)
 {
 	if (data)
-		netdev->features |= NETIF_F_HW_CSUM;
+		netdev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
 	else
-		netdev->features &= ~NETIF_F_HW_CSUM;
+		netdev->features &= ~(NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
 
 	return 0;
 }
@@ -304,15 +304,13 @@ static int igb_set_tso(struct net_device *netdev, u32 data)
 {
 	struct igb_adapter *adapter = netdev_priv(netdev);
 
-	if (data)
+	if (data) {
 		netdev->features |= NETIF_F_TSO;
-	else
-		netdev->features &= ~NETIF_F_TSO;
-
-	if (data)
 		netdev->features |= NETIF_F_TSO6;
-	else
+	} else {
+		netdev->features &= ~NETIF_F_TSO;
 		netdev->features &= ~NETIF_F_TSO6;
+	}
 
 	dev_info(&adapter->pdev->dev, "TSO is %s\n",
 		 data ? "Enabled" : "Disabled");
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
index e3a3582fec90..8c27e0a23dff 100644
--- a/trunk/drivers/net/igb/igb_main.c
+++ b/trunk/drivers/net/igb/igb_main.c
@@ -1158,11 +1158,12 @@ static int __devinit igb_probe(struct pci_dev *pdev,
 			"PHY reset is blocked due to SOL/IDER session.\n");
 
 	netdev->features = NETIF_F_SG |
-			   NETIF_F_HW_CSUM |
+			   NETIF_F_IP_CSUM |
 			   NETIF_F_HW_VLAN_TX |
 			   NETIF_F_HW_VLAN_RX |
 			   NETIF_F_HW_VLAN_FILTER;
 
+	netdev->features |= NETIF_F_IPV6_CSUM;
 	netdev->features |= NETIF_F_TSO;
 	netdev->features |= NETIF_F_TSO6;
 
@@ -1172,7 +1173,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
 
 	netdev->vlan_features |= NETIF_F_TSO;
 	netdev->vlan_features |= NETIF_F_TSO6;
-	netdev->vlan_features |= NETIF_F_HW_CSUM;
+	netdev->vlan_features |= NETIF_F_IP_CSUM;
 	netdev->vlan_features |= NETIF_F_SG;
 
 	if (pci_using_dac)