aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ixgbe/ixgbe_ethtool.c6
-rw-r--r--drivers/net/ixgbe/ixgbe_main.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 3efe5dda10af..61c000e23094 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -233,15 +233,15 @@ static int ixgbe_set_rx_csum(struct net_device *netdev, u32 data)
233 233
234static u32 ixgbe_get_tx_csum(struct net_device *netdev) 234static u32 ixgbe_get_tx_csum(struct net_device *netdev)
235{ 235{
236 return (netdev->features & NETIF_F_HW_CSUM) != 0; 236 return (netdev->features & NETIF_F_IP_CSUM) != 0;
237} 237}
238 238
239static int ixgbe_set_tx_csum(struct net_device *netdev, u32 data) 239static int ixgbe_set_tx_csum(struct net_device *netdev, u32 data)
240{ 240{
241 if (data) 241 if (data)
242 netdev->features |= NETIF_F_HW_CSUM; 242 netdev->features |= (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM);
243 else 243 else
244 netdev->features &= ~NETIF_F_HW_CSUM; 244 netdev->features &= ~NETIF_F_IP_CSUM;
245 245
246 return 0; 246 return 0;
247} 247}
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index b5780991c17b..b6973ee905e3 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3593,7 +3593,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
3593 goto err_sw_init; 3593 goto err_sw_init;
3594 3594
3595 netdev->features = NETIF_F_SG | 3595 netdev->features = NETIF_F_SG |
3596 NETIF_F_HW_CSUM | 3596 NETIF_F_IP_CSUM |
3597 NETIF_F_HW_VLAN_TX | 3597 NETIF_F_HW_VLAN_TX |
3598 NETIF_F_HW_VLAN_RX | 3598 NETIF_F_HW_VLAN_RX |
3599 NETIF_F_HW_VLAN_FILTER; 3599 NETIF_F_HW_VLAN_FILTER;
@@ -3604,7 +3604,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
3604 3604
3605 netdev->vlan_features |= NETIF_F_TSO; 3605 netdev->vlan_features |= NETIF_F_TSO;
3606 netdev->vlan_features |= NETIF_F_TSO6; 3606 netdev->vlan_features |= NETIF_F_TSO6;
3607 netdev->vlan_features |= NETIF_F_HW_CSUM; 3607 netdev->vlan_features |= NETIF_F_IP_CSUM;
3608 netdev->vlan_features |= NETIF_F_SG; 3608 netdev->vlan_features |= NETIF_F_SG;
3609 3609
3610 if (pci_using_dac) 3610 if (pci_using_dac)