diff options
author | Ayaz Abdulla <aabdulla@nvidia.com> | 2006-06-10 22:47:26 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-06-11 09:25:15 -0400 |
commit | 6a78814f6c9e35e9b4815c1973c988555212d6ef (patch) | |
tree | d786e34f58b786664f0b776d2e82fecbd127b7b3 | |
parent | cac925a4aab1b7233d3beb591f53498816058a08 (diff) |
[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>
-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) | |||
2675 | return ret; | 2675 | return ret; |
2676 | } | 2676 | } |
2677 | 2677 | ||
2678 | #ifdef NETIF_F_TSO | ||
2679 | static int nv_set_tso(struct net_device *dev, u32 value) | 2678 | static int nv_set_tso(struct net_device *dev, u32 value) |
2680 | { | 2679 | { |
2681 | struct fe_priv *np = netdev_priv(dev); | 2680 | struct fe_priv *np = netdev_priv(dev); |
@@ -2683,9 +2682,8 @@ static int nv_set_tso(struct net_device *dev, u32 value) | |||
2683 | if ((np->driver_data & DEV_HAS_CHECKSUM)) | 2682 | if ((np->driver_data & DEV_HAS_CHECKSUM)) |
2684 | return ethtool_op_set_tso(dev, value); | 2683 | return ethtool_op_set_tso(dev, value); |
2685 | else | 2684 | else |
2686 | return value ? -EOPNOTSUPP : 0; | 2685 | return -EOPNOTSUPP; |
2687 | } | 2686 | } |
2688 | #endif | ||
2689 | 2687 | ||
2690 | static struct ethtool_ops ops = { | 2688 | static struct ethtool_ops ops = { |
2691 | .get_drvinfo = nv_get_drvinfo, | 2689 | .get_drvinfo = nv_get_drvinfo, |
@@ -2698,10 +2696,8 @@ static struct ethtool_ops ops = { | |||
2698 | .get_regs = nv_get_regs, | 2696 | .get_regs = nv_get_regs, |
2699 | .nway_reset = nv_nway_reset, | 2697 | .nway_reset = nv_nway_reset, |
2700 | .get_perm_addr = ethtool_op_get_perm_addr, | 2698 | .get_perm_addr = ethtool_op_get_perm_addr, |
2701 | #ifdef NETIF_F_TSO | ||
2702 | .get_tso = ethtool_op_get_tso, | 2699 | .get_tso = ethtool_op_get_tso, |
2703 | .set_tso = nv_set_tso | 2700 | .set_tso = nv_set_tso, |
2704 | #endif | ||
2705 | }; | 2701 | }; |
2706 | 2702 | ||
2707 | static void nv_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) | 2703 | static void nv_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) |