summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/faraday
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2017-04-12 13:27:04 +1000
committerDavid S. Miller <davem@davemloft.net>2017-04-12 10:17:01 -0400
commit8c3ed1315e129e97e47d267dea55d4cbc3b0e21a (patch)
tree7d8a0a72bf7c4bd0af42dff8395a79d5f8b4b062 /drivers/net/ethernet/faraday
parent6aff0bf641cf69e487d7b46fc8be773d161f814d (diff)
downloadlinux-8c3ed1315e129e97e47d267dea55d4cbc3b0e21a.tar.bz2
ftgmac100: Set netdev->hw_features
So features can be turned on/off via ethtool Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/faraday')
-rw-r--r--drivers/net/ethernet/faraday/ftgmac100.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 099309920d6a..a08226a9b0df 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -1474,14 +1474,15 @@ static int ftgmac100_probe(struct platform_device *pdev)
}
/* Base feature set */
- netdev->features = NETIF_F_RXCSUM | NETIF_F_HW_CSUM |
+ netdev->hw_features = NETIF_F_RXCSUM | NETIF_F_HW_CSUM |
NETIF_F_GRO | NETIF_F_SG;
/* AST2400 doesn't have working HW checksum generation */
if (np && (of_device_is_compatible(np, "aspeed,ast2400-mac")))
- netdev->features &= ~NETIF_F_HW_CSUM;
+ netdev->hw_features &= ~NETIF_F_HW_CSUM;
if (np && of_get_property(np, "no-hw-checksum", NULL))
- netdev->features &= ~(NETIF_F_HW_CSUM | NETIF_F_RXCSUM);
+ netdev->hw_features &= ~(NETIF_F_HW_CSUM | NETIF_F_RXCSUM);
+ netdev->features |= netdev->hw_features;
/* register network device */
err = register_netdev(netdev);