summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGiuseppe CAVALLARO <peppe.cavallaro@st.com>2014-09-01 09:17:53 +0200
committerDavid S. Miller <davem@davemloft.net>2014-09-02 06:51:29 +0200
commitcc25f0cbe4409d6a573b1f3bf7020d5b04076ee9 (patch)
tree5c4cb28b2c9559e255d7b0c2b26720e8774fc95d /drivers
parentstmmac: fix the rx csum feature (diff)
downloadlinux-cc25f0cbe4409d6a573b1f3bf7020d5b04076ee9.tar.xz
linux-cc25f0cbe4409d6a573b1f3bf7020d5b04076ee9.zip
stmmac: only remove RXCSUM feature if no rx coe is available
In case of the HW is not able to do the receive checksum offloading the only feature to remove is NETIF_F_RXCSUM. Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 0ed8ac81238b..6e6ee226de04 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2333,8 +2333,6 @@ static netdev_features_t stmmac_fix_features(struct net_device *dev,
if (priv->plat->rx_coe == STMMAC_RX_COE_NONE)
features &= ~NETIF_F_RXCSUM;
- else if (priv->plat->rx_coe == STMMAC_RX_COE_TYPE1)
- features &= ~NETIF_F_IPV6_CSUM;
if (!priv->plat->tx_coe)
features &= ~NETIF_F_ALL_CSUM;