diff --git a/[refs] b/[refs]
index fe2ef0e423f8..36adb7213a59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cac925a4aab1b7233d3beb591f53498816058a08
+refs/heads/master: 6a78814f6c9e35e9b4815c1973c988555212d6ef
diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c
index 5669b95162b3..a29b5a9f0fe2 100644
--- a/trunk/drivers/net/forcedeth.c
+++ b/trunk/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)