aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-09-15 17:41:06 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:17 -0400
commit88d3aafdae5c5e1d2dd9489a5c8a24e29d335f2e (patch)
tree272ce75c30a170420ac8bbfd679c3faed9f9d20a /drivers/net/e1000
parent09f75cd7bf13720738e6a196cc0107ce9a5bd5a0 (diff)
[ETHTOOL] Provide default behaviors for a few ethtool sub-ioctls
For the operations get-tx-csum get-sg get-tso get-ufo the default ethtool_op_xxx behavior is fine for all drivers, so we permit op==NULL to imply the default behavior. This provides a more uniform behavior across all drivers, eliminating ethtool(8) "ioctl not supported" errors on older drivers that had not been updated for the latest sub-ioctls. The ethtool_op_xxx() functions are left exported, in case anyone wishes to call them directly from a driver-private implementation -- a not-uncommon case. Should an ethtool_op_xxx() helper remain unused for a while, except by net/core/ethtool.c, we can un-export it at a later date. [ Resolved conflicts with set/get value ethtool patch... -DaveM ] Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e1000')
-rw-r--r--drivers/net/e1000/e1000_ethtool.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index 76d16aaf05b6..e6c4a3bb9e4c 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1965,9 +1965,7 @@ static const struct ethtool_ops e1000_ethtool_ops = {
1965 .set_rx_csum = e1000_set_rx_csum, 1965 .set_rx_csum = e1000_set_rx_csum,
1966 .get_tx_csum = e1000_get_tx_csum, 1966 .get_tx_csum = e1000_get_tx_csum,
1967 .set_tx_csum = e1000_set_tx_csum, 1967 .set_tx_csum = e1000_set_tx_csum,
1968 .get_sg = ethtool_op_get_sg,
1969 .set_sg = ethtool_op_set_sg, 1968 .set_sg = ethtool_op_set_sg,
1970 .get_tso = ethtool_op_get_tso,
1971 .set_tso = e1000_set_tso, 1969 .set_tso = e1000_set_tso,
1972 .self_test_count = e1000_diag_test_count, 1970 .self_test_count = e1000_diag_test_count,
1973 .self_test = e1000_diag_test, 1971 .self_test = e1000_diag_test,