diff options
-rw-r--r-- | drivers/net/tehuti.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 8564ec5cfb7f..8be71de725e5 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c | |||
@@ -2017,9 +2017,11 @@ bdx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
2017 | ndev->irq = pdev->irq; | 2017 | ndev->irq = pdev->irq; |
2018 | ndev->features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_TSO | 2018 | ndev->features = NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_TSO |
2019 | | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX | | 2019 | | NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX | |
2020 | NETIF_F_HW_VLAN_FILTER | 2020 | NETIF_F_HW_VLAN_FILTER | NETIF_F_RXCSUM |
2021 | /*| NETIF_F_FRAGLIST */ | 2021 | /*| NETIF_F_FRAGLIST */ |
2022 | ; | 2022 | ; |
2023 | ndev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG | | ||
2024 | NETIF_F_TSO | NETIF_F_HW_VLAN_TX; | ||
2023 | 2025 | ||
2024 | if (pci_using_dac) | 2026 | if (pci_using_dac) |
2025 | ndev->features |= NETIF_F_HIGHDMA; | 2027 | ndev->features |= NETIF_F_HIGHDMA; |
@@ -2188,24 +2190,6 @@ bdx_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo) | |||
2188 | } | 2190 | } |
2189 | 2191 | ||
2190 | /* | 2192 | /* |
2191 | * bdx_get_rx_csum - report whether receive checksums are turned on or off | ||
2192 | * @netdev | ||
2193 | */ | ||
2194 | static u32 bdx_get_rx_csum(struct net_device *netdev) | ||
2195 | { | ||
2196 | return 1; /* always on */ | ||
2197 | } | ||
2198 | |||
2199 | /* | ||
2200 | * bdx_get_tx_csum - report whether transmit checksums are turned on or off | ||
2201 | * @netdev | ||
2202 | */ | ||
2203 | static u32 bdx_get_tx_csum(struct net_device *netdev) | ||
2204 | { | ||
2205 | return (netdev->features & NETIF_F_IP_CSUM) != 0; | ||
2206 | } | ||
2207 | |||
2208 | /* | ||
2209 | * bdx_get_coalesce - get interrupt coalescing parameters | 2193 | * bdx_get_coalesce - get interrupt coalescing parameters |
2210 | * @netdev | 2194 | * @netdev |
2211 | * @ecoal | 2195 | * @ecoal |
@@ -2424,10 +2408,6 @@ static void bdx_set_ethtool_ops(struct net_device *netdev) | |||
2424 | .set_coalesce = bdx_set_coalesce, | 2408 | .set_coalesce = bdx_set_coalesce, |
2425 | .get_ringparam = bdx_get_ringparam, | 2409 | .get_ringparam = bdx_get_ringparam, |
2426 | .set_ringparam = bdx_set_ringparam, | 2410 | .set_ringparam = bdx_set_ringparam, |
2427 | .get_rx_csum = bdx_get_rx_csum, | ||
2428 | .get_tx_csum = bdx_get_tx_csum, | ||
2429 | .get_sg = ethtool_op_get_sg, | ||
2430 | .get_tso = ethtool_op_get_tso, | ||
2431 | .get_strings = bdx_get_strings, | 2411 | .get_strings = bdx_get_strings, |
2432 | .get_sset_count = bdx_get_sset_count, | 2412 | .get_sset_count = bdx_get_sset_count, |
2433 | .get_ethtool_stats = bdx_get_ethtool_stats, | 2413 | .get_ethtool_stats = bdx_get_ethtool_stats, |