igb: update feature flags supported in ethtool
This driver is currently using HW_CSUM which is not correct. Update this to use the IP_CSUM and IPV6_CSUM flags. In addition consolidate the TSO flag setting. 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>
This commit is contained in:
Родитель
0fbe67af3e
Коммит
7d8eb29e6e
|
@ -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");
|
||||
|
|
|
@ -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)
|
||||
|
|
Загрузка…
Ссылка в новой задаче