[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>

38 files changed, 13 insertions, 101 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 30310ed9f75f..58fad1b2f72e 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1572,11 +1572,8 @@ static const struct ethtool_ops cp_ethtool_ops = {
         .set_msglevel           = cp_set_msglevel,
         .get_rx_csum            = cp_get_rx_csum,
         .set_rx_csum            = cp_set_rx_csum,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
         .set_tx_csum            = ethtool_op_set_tx_csum, /* local! */
-        .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
-        .get_tso                = ethtool_op_get_tso,
         .set_tso                = ethtool_op_set_tso,
         .get_regs               = cp_get_regs,
         .get_wol                = cp_get_wol,
diff --git a/drivers/net/atl1/atl1_ethtool.c b/drivers/net/atl1/atl1_ethtool.c
index 1f616c5c1473..53353b60a9c8 100644
--- a/drivers/net/atl1/atl1_ethtool.c
+++ b/drivers/net/atl1/atl1_ethtool.c
@@ -489,15 +489,12 @@ const struct ethtool_ops atl1_ethtool_ops = {
         .get_pauseparam         = atl1_get_pauseparam,
         .set_pauseparam         = atl1_set_pauseparam,
         .get_rx_csum            = atl1_get_rx_csum,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
         .set_tx_csum            = ethtool_op_set_tx_hw_csum,
         .get_link               = ethtool_op_get_link,
-        .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
         .get_strings            = atl1_get_strings,
         .nway_reset             = atl1_nway_reset,
         .get_ethtool_stats      = atl1_get_ethtool_stats,
         .get_stats_count        = atl1_get_stats_count,
-        .get_tso                = ethtool_op_get_tso,
         .set_tso                = ethtool_op_set_tso,
 };
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index f1e7204f78c9..5ee805b3e0e6 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6257,11 +6257,8 @@ static const struct ethtool_ops bnx2_ethtool_ops = {
         .set_pauseparam         = bnx2_set_pauseparam,
         .get_rx_csum            = bnx2_get_rx_csum,
         .set_rx_csum            = bnx2_set_rx_csum,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
         .set_tx_csum            = bnx2_set_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
-        .get_tso                = ethtool_op_get_tso,
         .set_tso                = bnx2_set_tso,
         .self_test_count        = bnx2_self_test_count,
         .self_test              = bnx2_self_test,
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 88ff72ac9b0a..ea58144c220e 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4202,10 +4202,6 @@ static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,
 }
 
 static const struct ethtool_ops bond_ethtool_ops = {
-        .get_tx_csum            = ethtool_op_get_tx_csum,
-        .get_tso                = ethtool_op_get_tso,
-        .get_ufo                = ethtool_op_get_ufo,
-        .get_sg                 = ethtool_op_get_sg,
         .get_drvinfo            = bond_ethtool_get_drvinfo,
 };
 
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 884aa0cd0006..7029f13d008d 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -794,9 +794,7 @@ static const struct ethtool_ops t1_ethtool_ops = {
         .set_pauseparam    = set_pauseparam,
         .get_rx_csum       = get_rx_csum,
         .set_rx_csum       = set_rx_csum,
-        .get_tx_csum       = ethtool_op_get_tx_csum,
         .set_tx_csum       = ethtool_op_set_tx_csum,
-        .get_sg            = ethtool_op_get_sg,
         .set_sg            = ethtool_op_set_sg,
         .get_link          = ethtool_op_get_link,
         .get_strings       = get_strings,
@@ -804,7 +802,6 @@ static const struct ethtool_ops t1_ethtool_ops = {
         .get_ethtool_stats = get_stats,
         .get_regs_len      = get_regs_len,
         .get_regs          = get_regs,
-        .get_tso           = ethtool_op_get_tso,
         .set_tso           = set_tso,
 };
 
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 19937498589d..04633ea55202 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -1634,9 +1634,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = {
         .set_pauseparam = set_pauseparam,
         .get_rx_csum = get_rx_csum,
         .set_rx_csum = set_rx_csum,
-        .get_tx_csum = ethtool_op_get_tx_csum,
         .set_tx_csum = ethtool_op_set_tx_csum,
-        .get_sg = ethtool_op_get_sg,
         .set_sg = ethtool_op_set_sg,
         .get_link = ethtool_op_get_link,
         .get_strings = get_strings,
@@ -1647,7 +1645,6 @@ static const struct ethtool_ops cxgb_ethtool_ops = {
         .get_regs_len = get_regs_len,
         .get_regs = get_regs,
         .get_wol = get_wol,
-        .get_tso = ethtool_op_get_tso,
         .set_tso = ethtool_op_set_tso,
 };
 
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 = {
         .set_rx_csum            = e1000_set_rx_csum,
         .get_tx_csum            = e1000_get_tx_csum,
         .set_tx_csum            = e1000_set_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
-        .get_tso                = ethtool_op_get_tso,
         .set_tso                = e1000_set_tso,
         .self_test_count        = e1000_diag_test_count,
         .self_test              = e1000_diag_test,
diff --git a/drivers/net/ehea/ehea_ethtool.c b/drivers/net/ehea/ehea_ethtool.c
index 29ef7a98f8be..6498455bf97c 100644
--- a/drivers/net/ehea/ehea_ethtool.c
+++ b/drivers/net/ehea/ehea_ethtool.c
@@ -262,9 +262,6 @@ const struct ethtool_ops ehea_ethtool_ops = {
         .get_msglevel = ehea_get_msglevel,
         .set_msglevel = ehea_set_msglevel,
         .get_link = ethtool_op_get_link,
-        .get_tx_csum = ethtool_op_get_tx_csum,
-        .get_sg = ethtool_op_get_sg,
-        .get_tso = ethtool_op_get_tso,
         .set_tso = ethtool_op_set_tso,
         .get_strings = ehea_get_strings,
         .get_stats_count = ehea_get_stats_count,
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 122ffd2f0822..5ac56f20003d 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -1494,8 +1494,6 @@ static const struct ethtool_ops netdev_ethtool_ops = {
         .get_link               = netdev_get_link,
         .get_msglevel           = netdev_get_msglevel,
         .set_msglevel           = netdev_set_msglevel,
-        .get_sg                 = ethtool_op_get_sg,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
         .begin                  = ethtool_begin,
         .complete               = ethtool_complete
 };
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index e9353072a96d..402b071d8d53 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -1891,8 +1891,6 @@ static const struct ethtool_ops netdev_ethtool_ops = {
         .get_link               = netdev_get_link,
         .get_msglevel           = netdev_get_msglevel,
         .set_msglevel           = netdev_set_msglevel,
-        .get_sg                 = ethtool_op_get_sg,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
 };
 
 static int mii_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/fec_8xx/fec_main.c b/drivers/net/fec_8xx/fec_main.c
index 6f214ab12fff..8d2904fa5789 100644
--- a/drivers/net/fec_8xx/fec_main.c
+++ b/drivers/net/fec_8xx/fec_main.c
@@ -1041,9 +1041,7 @@ static const struct ethtool_ops fec_ethtool_ops = {
         .get_link       = ethtool_op_get_link,
         .get_msglevel   = fec_get_msglevel,
         .set_msglevel   = fec_set_msglevel,
-        .get_tx_csum    = ethtool_op_get_tx_csum,
         .set_tx_csum    = ethtool_op_set_tx_csum,       /* local! */
-        .get_sg         = ethtool_op_get_sg,
         .set_sg         = ethtool_op_set_sg,
         .get_regs       = fec_get_regs,
 };
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 050a8f14eda8..be744573b1c2 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -4710,7 +4710,6 @@ static const struct ethtool_ops ops = {
         .get_regs_len = nv_get_regs_len,
         .get_regs = nv_get_regs,
         .nway_reset = nv_nway_reset,
-        .get_tso = ethtool_op_get_tso,
         .set_tso = nv_set_tso,
         .get_ringparam = nv_get_ringparam,
         .set_ringparam = nv_set_ringparam,
@@ -4718,9 +4717,7 @@ static const struct ethtool_ops ops = {
         .set_pauseparam = nv_set_pauseparam,
         .get_rx_csum = nv_get_rx_csum,
         .set_rx_csum = nv_set_rx_csum,
-        .get_tx_csum = ethtool_op_get_tx_csum,
         .set_tx_csum = nv_set_tx_csum,
-        .get_sg = ethtool_op_get_sg,
         .set_sg = nv_set_sg,
         .get_strings = nv_get_strings,
         .get_stats_count = nv_get_stats_count,
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index f6789a8db8cd..f9079599dd22 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -907,9 +907,7 @@ static const struct ethtool_ops fs_ethtool_ops = {
         .get_link = ethtool_op_get_link,
         .get_msglevel = fs_get_msglevel,
         .set_msglevel = fs_set_msglevel,
-        .get_tx_csum = ethtool_op_get_tx_csum,
         .set_tx_csum = ethtool_op_set_tx_csum,  /* local! */
-        .get_sg = ethtool_op_get_sg,
         .set_sg = ethtool_op_set_sg,
         .get_regs = fs_get_regs,
 };
diff --git a/drivers/net/ibm_emac/ibm_emac_core.c b/drivers/net/ibm_emac/ibm_emac_core.c
index 354616b0b57b..d7da56b105cb 100644
--- a/drivers/net/ibm_emac/ibm_emac_core.c
+++ b/drivers/net/ibm_emac/ibm_emac_core.c
@@ -1900,8 +1900,6 @@ static const struct ethtool_ops emac_ethtool_ops = {
         .get_ethtool_stats = emac_ethtool_get_ethtool_stats,
 
         .get_link = ethtool_op_get_link,
-        .get_tx_csum = ethtool_op_get_tx_csum,
-        .get_sg = ethtool_op_get_sg,
 };
 
 static int emac_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index bdbf3dead4e2..0636883449fc 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -821,15 +821,11 @@ static const struct ethtool_ops netdev_ethtool_ops = {
         .get_drvinfo            = netdev_get_drvinfo,
         .get_settings           = netdev_get_settings,
         .get_link               = netdev_get_link,
-        .get_sg                 = ethtool_op_get_sg,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
         .set_tx_csum            = ibmveth_set_tx_csum,
         .get_rx_csum            = ibmveth_get_rx_csum,
         .set_rx_csum            = ibmveth_set_rx_csum,
-        .get_tso                        = ethtool_op_get_tso,
-        .get_ufo                        = ethtool_op_get_ufo,
         .get_strings            = ibmveth_get_strings,
-        .get_stats_count                = ibmveth_get_stats_count,
+        .get_stats_count        = ibmveth_get_stats_count,
         .get_ethtool_stats      = ibmveth_get_ethtool_stats,
 };
 
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c
index 21d35bc53906..181b59dc1ac3 100644
--- a/drivers/net/ixgb/ixgb_ethtool.c
+++ b/drivers/net/ixgb/ixgb_ethtool.c
@@ -713,11 +713,9 @@ static const struct ethtool_ops ixgb_ethtool_ops = {
         .set_rx_csum = ixgb_set_rx_csum,
         .get_tx_csum = ixgb_get_tx_csum,
         .set_tx_csum = ixgb_set_tx_csum,
-        .get_sg = ethtool_op_get_sg,
         .set_sg = ethtool_op_set_sg,
         .get_msglevel = ixgb_get_msglevel,
         .set_msglevel = ixgb_set_msglevel,
-        .get_tso = ethtool_op_get_tso,
         .set_tso = ixgb_set_tso,
         .get_strings = ixgb_get_strings,
         .phys_id = ixgb_phys_id,
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index a328da72833c..0e2252fd71ab 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -192,7 +192,6 @@ static u32 always_on(struct net_device *dev)
 
 static const struct ethtool_ops loopback_ethtool_ops = {
         .get_link               = always_on,
-        .get_tso                = ethtool_op_get_tso,
         .set_tso                = ethtool_op_set_tso,
         .get_tx_csum            = always_on,
         .get_sg                 = always_on,
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 2de073da182c..2f6cdaa88729 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -282,10 +282,6 @@ static u32 macvlan_ethtool_get_rx_csum(struct net_device *dev)
 static const struct ethtool_ops macvlan_ethtool_ops = {
         .get_link               = ethtool_op_get_link,
         .get_rx_csum            = macvlan_ethtool_get_rx_csum,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
-        .get_tso                = ethtool_op_get_tso,
-        .get_ufo                = ethtool_op_get_ufo,
-        .get_sg                 = ethtool_op_get_sg,
         .get_drvinfo            = macvlan_ethtool_get_drvinfo,
 };
 
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 35781616eb23..34df02cfdbe7 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2735,7 +2735,6 @@ static const struct ethtool_ops mv643xx_ethtool_ops = {
         .set_settings           = mv643xx_set_settings,
         .get_drvinfo            = mv643xx_get_drvinfo,
         .get_link               = mv643xx_eth_get_link,
-        .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
         .get_stats_count        = mv643xx_get_stats_count,
         .get_ethtool_stats      = mv643xx_get_ethtool_stats,
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 6dc28b824935..2f8864e70ca9 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -1499,11 +1499,8 @@ static const struct ethtool_ops myri10ge_ethtool_ops = {
         .get_ringparam = myri10ge_get_ringparam,
         .get_rx_csum = myri10ge_get_rx_csum,
         .set_rx_csum = myri10ge_set_rx_csum,
-        .get_tx_csum = ethtool_op_get_tx_csum,
         .set_tx_csum = ethtool_op_set_tx_hw_csum,
-        .get_sg = ethtool_op_get_sg,
         .set_sg = ethtool_op_set_sg,
-        .get_tso = ethtool_op_get_tso,
         .set_tso = ethtool_op_set_tso,
         .get_link = ethtool_op_get_link,
         .get_strings = myri10ge_get_strings,
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index 7ec362b2e3e5..a5879672903e 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -635,8 +635,6 @@ static void ne2k_pci_get_drvinfo(struct net_device *dev,
 
 static const struct ethtool_ops ne2k_pci_ethtool_ops = {
         .get_drvinfo            = ne2k_pci_get_drvinfo,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
 };
 
 static void __devexit ne2k_pci_remove_one (struct pci_dev *pdev)
diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index a6138b474b4a..08c76b343663 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -744,11 +744,8 @@ struct ethtool_ops netxen_nic_ethtool_ops = {
         .get_ringparam = netxen_nic_get_ringparam,
         .get_pauseparam = netxen_nic_get_pauseparam,
         .set_pauseparam = netxen_nic_set_pauseparam,
-        .get_tx_csum = ethtool_op_get_tx_csum,
         .set_tx_csum = ethtool_op_set_tx_csum,
-        .get_sg = ethtool_op_get_sg,
         .set_sg = ethtool_op_set_sg,
-        .get_tso = ethtool_op_get_tso,
         .set_tso = ethtool_op_set_tso,
         .self_test_count = netxen_nic_diag_test_count,
         .self_test = netxen_nic_diag_test,
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index 724d90bd1feb..4840ddea71ac 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -1509,9 +1509,6 @@ static const struct ethtool_ops pcnet32_ethtool_ops = {
         .get_link               = pcnet32_get_link,
         .get_ringparam          = pcnet32_get_ringparam,
         .set_ringparam          = pcnet32_set_ringparam,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
-        .get_tso                = ethtool_op_get_tso,
         .get_strings            = pcnet32_get_strings,
         .self_test_count        = pcnet32_self_test_count,
         .self_test              = pcnet32_ethtool_test,
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index b8809a8ef204..06a1a6f2d17b 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1061,11 +1061,8 @@ static const struct ethtool_ops rtl8169_ethtool_ops = {
         .set_msglevel           = rtl8169_set_msglevel,
         .get_rx_csum            = rtl8169_get_rx_csum,
         .set_rx_csum            = rtl8169_set_rx_csum,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
         .set_tx_csum            = ethtool_op_set_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
-        .get_tso                = ethtool_op_get_tso,
         .set_tso                = ethtool_op_set_tso,
         .get_regs               = rtl8169_get_regs,
         .get_wol                = rtl8169_get_wol,
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index f77049b34e16..a285dd734a03 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -6326,13 +6326,10 @@ static const struct ethtool_ops netdev_ethtool_ops = {
         .set_pauseparam = s2io_ethtool_setpause_data,
         .get_rx_csum = s2io_ethtool_get_rx_csum,
         .set_rx_csum = s2io_ethtool_set_rx_csum,
-        .get_tx_csum = ethtool_op_get_tx_csum,
         .set_tx_csum = s2io_ethtool_op_set_tx_csum,
-        .get_sg = ethtool_op_get_sg,
         .set_sg = ethtool_op_set_sg,
         .get_tso = s2io_ethtool_op_get_tso,
         .set_tso = s2io_ethtool_op_set_tso,
-        .get_ufo = ethtool_op_get_ufo,
         .set_ufo = ethtool_op_set_ufo,
         .self_test_count = s2io_ethtool_self_test_count,
         .self_test = s2io_ethtool_test,
diff --git a/drivers/net/sc92031.c b/drivers/net/sc92031.c
index 872cb1cc9c41..02c472ecbe55 100644
--- a/drivers/net/sc92031.c
+++ b/drivers/net/sc92031.c
@@ -1396,13 +1396,9 @@ static struct ethtool_ops sc92031_ethtool_ops = {
         .set_wol                = sc92031_ethtool_set_wol,
         .nway_reset             = sc92031_ethtool_nway_reset,
         .get_link               = ethtool_op_get_link,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
-        .get_tso                = ethtool_op_get_tso,
         .get_strings            = sc92031_ethtool_get_strings,
         .get_stats_count        = sc92031_ethtool_get_stats_count,
         .get_ethtool_stats      = sc92031_ethtool_get_ethtool_stats,
-        .get_ufo                = ethtool_op_get_ufo,
 };
 
 static int __devinit sc92031_probe(struct pci_dev *pdev,
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 47a144d000d5..cac499f84131 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -811,9 +811,7 @@ static const struct ethtool_ops skge_ethtool_ops = {
         .set_pauseparam = skge_set_pauseparam,
         .get_coalesce   = skge_get_coalesce,
         .set_coalesce   = skge_set_coalesce,
-        .get_sg         = ethtool_op_get_sg,
         .set_sg         = skge_set_sg,
-        .get_tx_csum    = ethtool_op_get_tx_csum,
         .set_tx_csum    = skge_set_tx_csum,
         .get_rx_csum    = skge_get_rx_csum,
         .set_rx_csum    = skge_set_rx_csum,
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 1b9e5f40ddee..b8c15f881eba 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3710,11 +3710,8 @@ static const struct ethtool_ops sky2_ethtool_ops = {
         .get_eeprom_len = sky2_get_eeprom_len,
         .get_eeprom     = sky2_get_eeprom,
         .set_eeprom     = sky2_set_eeprom,
-        .get_sg         = ethtool_op_get_sg,
         .set_sg         = ethtool_op_set_sg,
-        .get_tx_csum    = ethtool_op_get_tx_csum,
         .set_tx_csum    = sky2_set_tx_csum,
-        .get_tso        = ethtool_op_get_tso,
         .set_tso        = sky2_set_tso,
         .get_rx_csum    = sky2_get_rx_csum,
         .set_rx_csum    = sky2_set_rx_csum,
diff --git a/drivers/net/spider_net_ethtool.c b/drivers/net/spider_net_ethtool.c
index d940474e024a..1460d5006d1c 100644
--- a/drivers/net/spider_net_ethtool.c
+++ b/drivers/net/spider_net_ethtool.c
@@ -188,7 +188,6 @@ const struct ethtool_ops spider_net_ethtool_ops = {
         .nway_reset             = spider_net_ethtool_nway_reset,
         .get_rx_csum            = spider_net_ethtool_get_rx_csum,
         .set_rx_csum            = spider_net_ethtool_set_rx_csum,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
         .set_tx_csum            = ethtool_op_set_tx_csum,
         .get_ringparam          = spider_net_ethtool_get_ringparam,
         .get_strings            = spider_net_get_strings,
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 369a172a04aa..1b860e0817f6 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -9278,11 +9278,8 @@ static const struct ethtool_ops tg3_ethtool_ops = {
         .set_pauseparam         = tg3_set_pauseparam,
         .get_rx_csum            = tg3_get_rx_csum,
         .set_rx_csum            = tg3_set_rx_csum,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
         .set_tx_csum            = tg3_set_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
-        .get_tso                = ethtool_op_get_tso,
         .set_tso                = tg3_set_tso,
         .self_test_count        = tg3_get_test_count,
         .self_test              = tg3_self_test,
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index bd04e93908ef..ba3d0e5574a4 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1670,8 +1670,6 @@ static void de_get_regs(struct net_device *dev, struct ethtool_regs *regs,
 
 static const struct ethtool_ops de_ethtool_ops = {
         .get_link               = ethtool_op_get_link,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
         .get_drvinfo            = de_get_drvinfo,
         .get_regs_len           = de_get_regs_len,
         .get_settings           = de_get_settings,
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 396f8455cd32..e00833fadc0b 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -1451,8 +1451,6 @@ static const struct ethtool_ops netdev_ethtool_ops = {
         .get_link               = netdev_get_link,
         .get_msglevel           = netdev_get_msglevel,
         .set_msglevel           = netdev_set_msglevel,
-        .get_sg                 = ethtool_op_get_sg,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
 };
 
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 84d99fc77891..c6d8513ecad6 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -1236,11 +1236,8 @@ static const struct ethtool_ops typhoon_ethtool_ops = {
         .set_wol                = typhoon_set_wol,
         .get_link               = ethtool_op_get_link,
         .get_rx_csum            = typhoon_get_rx_csum,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
         .set_tx_csum            = ethtool_op_set_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
-        .get_tso                = ethtool_op_get_tso,
         .set_tso                = ethtool_op_set_tso,
         .get_ringparam          = typhoon_get_ringparam,
 };
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ucc_geth_ethtool.c
index 64bef7c12365..73aa677a4a3e 100644
--- a/drivers/net/ucc_geth_ethtool.c
+++ b/drivers/net/ucc_geth_ethtool.c
@@ -373,9 +373,7 @@ static const struct ethtool_ops uec_ethtool_ops = {
         .set_ringparam          = uec_set_ringparam,
         .get_pauseparam         = uec_get_pauseparam,
         .set_pauseparam         = uec_set_pauseparam,
-        .get_sg                 = ethtool_op_get_sg,
         .set_sg                 = ethtool_op_set_sg,
-        .get_tso                = ethtool_op_get_tso,
         .get_stats_count        = uec_get_stats_count,
         .get_strings            = uec_get_strings,
         .get_ethtool_stats      = uec_get_ethtool_stats,
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 987f5b937e3c..d55c4fdff489 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -1813,8 +1813,6 @@ static const struct ethtool_ops netdev_ethtool_ops = {
         .set_msglevel           = netdev_set_msglevel,
         .get_wol                = rhine_get_wol,
         .set_wol                = rhine_set_wol,
-        .get_sg                 = ethtool_op_get_sg,
-        .get_tx_csum            = ethtool_op_get_tx_csum,
 };
 
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
index 78e344ae7051..f464b82c7d5f 100644
--- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c
@@ -1617,11 +1617,8 @@ static void backend_changed(struct xenbus_device *dev,
 
 static struct ethtool_ops xennet_ethtool_ops =
 {
-        .get_tx_csum = ethtool_op_get_tx_csum,
         .set_tx_csum = ethtool_op_set_tx_csum,
-        .get_sg = ethtool_op_get_sg,
         .set_sg = xennet_set_sg,
-        .get_tso = ethtool_op_get_tso,
         .set_tso = xennet_set_tso,
         .get_link = ethtool_op_get_link,
 };
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index f803e39eee28..c07bac5e3e10 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -150,11 +150,8 @@ static int br_set_tx_csum(struct net_device *dev, u32 data)
 static struct ethtool_ops br_ethtool_ops = {
         .get_drvinfo = br_getinfo,
         .get_link = ethtool_op_get_link,
-        .get_sg = ethtool_op_get_sg,
         .set_sg = br_set_sg,
-        .get_tx_csum = ethtool_op_get_tx_csum,
         .set_tx_csum = br_set_tx_csum,
-        .get_tso = ethtool_op_get_tso,
         .set_tso = br_set_tso,
 };
 
diff --git a/net/core/ethtool.c b/net/core/ethtool.c
index 0d0b13cc1dd3..1163eb2256d0 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -893,21 +893,27 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
                 break;
         case ETHTOOL_GTXCSUM:
                 rc = ethtool_get_value(dev, useraddr, ethcmd,
-                                       dev->ethtool_ops->get_tx_csum);
+                                       (dev->ethtool_ops->get_tx_csum ?
+                                        dev->ethtool_ops->get_tx_csum :
+                                        ethtool_op_get_tx_csum));
                 break;
         case ETHTOOL_STXCSUM:
                 rc = ethtool_set_tx_csum(dev, useraddr);
                 break;
         case ETHTOOL_GSG:
                 rc = ethtool_get_value(dev, useraddr, ethcmd,
-                                       dev->ethtool_ops->get_sg);
+                                       (dev->ethtool_ops->get_sg ?
+                                        dev->ethtool_ops->get_sg :
+                                        ethtool_op_get_sg));
                 break;
         case ETHTOOL_SSG:
                 rc = ethtool_set_sg(dev, useraddr);
                 break;
         case ETHTOOL_GTSO:
                 rc = ethtool_get_value(dev, useraddr, ethcmd,
-                                       dev->ethtool_ops->get_tso);
+                                       (dev->ethtool_ops->get_tso ?
+                                        dev->ethtool_ops->get_tso :
+                                        ethtool_op_get_tso));
                 break;
         case ETHTOOL_STSO:
                 rc = ethtool_set_tso(dev, useraddr);
@@ -929,7 +935,9 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
                 break;
         case ETHTOOL_GUFO:
                 rc = ethtool_get_value(dev, useraddr, ethcmd,
-                                       dev->ethtool_ops->get_ufo);
+                                       (dev->ethtool_ops->get_ufo ?
+                                        dev->ethtool_ops->get_ufo :
+                                        ethtool_op_get_ufo));
                 break;
         case ETHTOOL_SUFO:
                 rc = ethtool_set_ufo(dev, useraddr);