diff options
| author | Ayaz Abdulla | 2006-06-11 04:47:26 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2006-06-11 15:25:15 +0200 |
| commit | 6a78814f6c9e35e9b4815c1973c988555212d6ef (patch) | |
| tree | d786e34f58b786664f0b776d2e82fecbd127b7b3 /drivers/net/forcedeth.c | |
| parent | Merge branch 'upstream' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 ... (diff) | |
| download | kernel-qcow2-linux-6a78814f6c9e35e9b4815c1973c988555212d6ef.tar.gz kernel-qcow2-linux-6a78814f6c9e35e9b4815c1973c988555212d6ef.tar.xz kernel-qcow2-linux-6a78814f6c9e35e9b4815c1973c988555212d6ef.zip | |
[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>
Diffstat (limited to 'drivers/net/forcedeth.c')
| -rw-r--r-- | drivers/net/forcedeth.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 5669b95162b3..a29b5a9f0fe2 100644 --- 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) |