[PATCH] stmmac: fix driver features
From: Giuseppe CAVALLARO <hidden>
Date: 2012-02-09 10:56:45
Subsystem:
networking drivers, stmmac ethernet driver, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Chevallier, Linus Torvalds
New GMAC chips can set the tx_coe and rx_csum flags by looking at the HW cap register and this happens during the open. This patch fixes the stmmac_fix_feature function that in some cases assumes that there is no HW csum because no flags are passed through the platform. As soon as the open method is called then the stmmac_fix_feature could want to turn-on the NETIF_F_RXCSUM or NETIF_F_ALL_CSUM. Signed-off-by: Giuseppe Cavallaro <redacted> --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 36ee77f..e03a873 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c@@ -1541,8 +1541,13 @@ static netdev_features_t stmmac_fix_features(struct net_device *dev, if (!priv->rx_coe) features &= ~NETIF_F_RXCSUM; + else + features |= NETIF_F_RXCSUM; + if (!priv->plat->tx_coe) features &= ~NETIF_F_ALL_CSUM; + else + features |= NETIF_F_ALL_CSUM; /* Some GMAC devices have a bugged Jumbo frame support that * needs to have the Tx COE disabled for oversized frames
--
1.7.4.4