diff options
Diffstat (limited to 'drivers/net/stmmac/stmmac_ethtool.c')
-rw-r--r-- | drivers/net/stmmac/stmmac_ethtool.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/net/stmmac/stmmac_ethtool.c b/drivers/net/stmmac/stmmac_ethtool.c index 6d65482e789..fd719edc7f7 100644 --- a/drivers/net/stmmac/stmmac_ethtool.c +++ b/drivers/net/stmmac/stmmac_ethtool.c | |||
@@ -94,7 +94,7 @@ static void stmmac_ethtool_getdrvinfo(struct net_device *dev, | |||
94 | { | 94 | { |
95 | struct stmmac_priv *priv = netdev_priv(dev); | 95 | struct stmmac_priv *priv = netdev_priv(dev); |
96 | 96 | ||
97 | if (!priv->is_gmac) | 97 | if (!priv->plat->has_gmac) |
98 | strcpy(info->driver, MAC100_ETHTOOL_NAME); | 98 | strcpy(info->driver, MAC100_ETHTOOL_NAME); |
99 | else | 99 | else |
100 | strcpy(info->driver, GMAC_ETHTOOL_NAME); | 100 | strcpy(info->driver, GMAC_ETHTOOL_NAME); |
@@ -176,7 +176,7 @@ static void stmmac_ethtool_gregs(struct net_device *dev, | |||
176 | 176 | ||
177 | memset(reg_space, 0x0, REG_SPACE_SIZE); | 177 | memset(reg_space, 0x0, REG_SPACE_SIZE); |
178 | 178 | ||
179 | if (!priv->is_gmac) { | 179 | if (!priv->plat->has_gmac) { |
180 | /* MAC registers */ | 180 | /* MAC registers */ |
181 | for (i = 0; i < 12; i++) | 181 | for (i = 0; i < 12; i++) |
182 | reg_space[i] = readl(priv->ioaddr + (i * 4)); | 182 | reg_space[i] = readl(priv->ioaddr + (i * 4)); |
@@ -197,16 +197,6 @@ static void stmmac_ethtool_gregs(struct net_device *dev, | |||
197 | } | 197 | } |
198 | } | 198 | } |
199 | 199 | ||
200 | static int stmmac_ethtool_set_tx_csum(struct net_device *netdev, u32 data) | ||
201 | { | ||
202 | if (data) | ||
203 | netdev->features |= NETIF_F_HW_CSUM; | ||
204 | else | ||
205 | netdev->features &= ~NETIF_F_HW_CSUM; | ||
206 | |||
207 | return 0; | ||
208 | } | ||
209 | |||
210 | static u32 stmmac_ethtool_get_rx_csum(struct net_device *dev) | 200 | static u32 stmmac_ethtool_get_rx_csum(struct net_device *dev) |
211 | { | 201 | { |
212 | struct stmmac_priv *priv = netdev_priv(dev); | 202 | struct stmmac_priv *priv = netdev_priv(dev); |
@@ -370,7 +360,7 @@ static struct ethtool_ops stmmac_ethtool_ops = { | |||
370 | .get_link = ethtool_op_get_link, | 360 | .get_link = ethtool_op_get_link, |
371 | .get_rx_csum = stmmac_ethtool_get_rx_csum, | 361 | .get_rx_csum = stmmac_ethtool_get_rx_csum, |
372 | .get_tx_csum = ethtool_op_get_tx_csum, | 362 | .get_tx_csum = ethtool_op_get_tx_csum, |
373 | .set_tx_csum = stmmac_ethtool_set_tx_csum, | 363 | .set_tx_csum = ethtool_op_set_tx_ipv6_csum, |
374 | .get_sg = ethtool_op_get_sg, | 364 | .get_sg = ethtool_op_get_sg, |
375 | .set_sg = ethtool_op_set_sg, | 365 | .set_sg = ethtool_op_set_sg, |
376 | .get_pauseparam = stmmac_get_pauseparam, | 366 | .get_pauseparam = stmmac_get_pauseparam, |