[PATCH] forcedeth config: tso cleanup

There are a series of patches for configuration support in forcedeth and
one patch for device ids.

This patch is a cleanup of the a previous TSO patch.

Signed-Off-By: Ayaz Abdulla <aabdulla@nvidia.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 5669b95162b3cccc544bc1ca9e9e7ce08adc6385..a29b5a9f0fe287820e395f32a13ce73dc4eecd51 100644 (file)
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -2675,7 +2675,6 @@ static int nv_nway_reset(struct net_device *dev)
        return ret;
 }
 
-#ifdef NETIF_F_TSO
 static int nv_set_tso(struct net_device *dev, u32 value)
 {
        struct fe_priv *np = netdev_priv(dev);
@@ -2683,9 +2682,8 @@ static int nv_set_tso(struct net_device *dev, u32 value)
        if ((np->driver_data & DEV_HAS_CHECKSUM))
                return ethtool_op_set_tso(dev, value);
        else
-               return value ? -EOPNOTSUPP : 0;
+               return -EOPNOTSUPP;
 }
-#endif
 
 static struct ethtool_ops ops = {
        .get_drvinfo = nv_get_drvinfo,
@@ -2698,10 +2696,8 @@ static struct ethtool_ops ops = {
        .get_regs = nv_get_regs,
        .nway_reset = nv_nway_reset,
        .get_perm_addr = ethtool_op_get_perm_addr,
-#ifdef NETIF_F_TSO
        .get_tso = ethtool_op_get_tso,
-       .set_tso = nv_set_tso
-#endif
+       .set_tso = nv_set_tso,
 };
 
 static void nv_vlan_rx_register(struct net_device *dev, struct vlan_group *grp)