diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-06-08 19:24:46 (GMT) |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-06-08 19:24:46 (GMT) |
commit | d15a88fc21ef225768ce31be16edfc9c6e2e02e3 (patch) | |
tree | d4cb0a1bc97973bb947e2667ae56bc4bc2256e9d /drivers/net/forcedeth.c | |
parent | b53471711f21ba0e151075f0e1d6d531eb50f1b1 (diff) | |
parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) | |
download | linux-fsl-qoriq-d15a88fc21ef225768ce31be16edfc9c6e2e02e3.tar.xz |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/net/forcedeth.c')
-rw-r--r-- | drivers/net/forcedeth.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 66ea5fc..5669b95 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c @@ -2675,6 +2675,18 @@ 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); + + if ((np->driver_data & DEV_HAS_CHECKSUM)) + return ethtool_op_set_tso(dev, value); + else + return value ? -EOPNOTSUPP : 0; +} +#endif + static struct ethtool_ops ops = { .get_drvinfo = nv_get_drvinfo, .get_link = ethtool_op_get_link, @@ -2686,6 +2698,10 @@ 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 }; static void nv_vlan_rx_register(struct net_device *dev, struct vlan_group *grp) |