Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (867 commits)
  [SKY2]: status polling loop (post merge)
  [NET]: Fix NAPI completion handling in some drivers.
  [TCP]: Limit processing lost_retrans loop to work-to-do cases
  [TCP]: Fix lost_retrans loop vs fastpath problems
  [TCP]: No need to re-count fackets_out/sacked_out at RTO
  [TCP]: Extract tcp_match_queue_to_sack from sacktag code
  [TCP]: Kill almost unused variable pcount from sacktag
  [TCP]: Fix mark_head_lost to ignore R-bit when trying to mark L
  [TCP]: Add bytes_acked (ABC) clearing to FRTO too
  [IPv6]: Update setsockopt(IPV6_MULTICAST_IF) to support RFC 3493, try2
  [NETFILTER]: x_tables: add missing ip6t_modulename aliases
  [NETFILTER]: nf_conntrack_tcp: fix connection reopening
  [QETH]: fix qeth_main.c
  [NETLINK]: fib_frontend build fixes
  [IPv6]: Export userland ND options through netlink (RDNSS support)
  [9P]: build fix with !CONFIG_SYSCTL
  [NET]: Fix dev_put() and dev_hold() comments
  [NET]: make netlink user -> kernel interface synchronious
  [NET]: unify netlink kernel socket recognition
  [NET]: cleanup 3rd argument in netlink_sendskb
  ...

Fix up conflicts manually in Documentation/feature-removal-schedule.txt
and my new least favourite crap, the "mod_devicetable" support in the
files include/linux/mod_devicetable.h and scripts/mod/file2alias.c.

(The latter files seem to be explicitly _designed_ to get conflicts when
different subsystems work with them - that have an absolutely horrid
lack of subsystem separation!)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 15 insertions, 13 deletions

diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ucc_geth_ethtool.c
index 64bef7c12365..9a9622c13e2b 100644
--- a/drivers/net/ucc_geth_ethtool.c
+++ b/drivers/net/ucc_geth_ethtool.c
@@ -276,20 +276,26 @@ uec_set_ringparam(struct net_device *netdev,
         return ret;
 }
 
-static int uec_get_stats_count(struct net_device *netdev)
+static int uec_get_sset_count(struct net_device *netdev, int sset)
 {
         struct ucc_geth_private *ugeth = netdev_priv(netdev);
         u32 stats_mode = ugeth->ug_info->statisticsMode;
         int len = 0;
 
-        if (stats_mode & UCC_GETH_STATISTICS_GATHERING_MODE_HARDWARE)
-                len += UEC_HW_STATS_LEN;
-        if (stats_mode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_TX)
-                len += UEC_TX_FW_STATS_LEN;
-        if (stats_mode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_RX)
-                len += UEC_RX_FW_STATS_LEN;
+        switch (sset) {
+        case ETH_SS_STATS:
+                if (stats_mode & UCC_GETH_STATISTICS_GATHERING_MODE_HARDWARE)
+                        len += UEC_HW_STATS_LEN;
+                if (stats_mode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_TX)
+                        len += UEC_TX_FW_STATS_LEN;
+                if (stats_mode & UCC_GETH_STATISTICS_GATHERING_MODE_FIRMWARE_RX)
+                        len += UEC_RX_FW_STATS_LEN;
+
+                return len;
 
-        return len;
+        default:
+                return -EOPNOTSUPP;
+        }
 }
 
 static void uec_get_strings(struct net_device *netdev, u32 stringset, u8 *buf)
@@ -353,8 +359,6 @@ uec_get_drvinfo(struct net_device *netdev,
         strncpy(drvinfo->version, DRV_VERSION, 32);
         strncpy(drvinfo->fw_version, "N/A", 32);
         strncpy(drvinfo->bus_info, "QUICC ENGINE", 32);
-        drvinfo->n_stats = uec_get_stats_count(netdev);
-        drvinfo->testinfo_len = 0;
         drvinfo->eedump_len = 0;
         drvinfo->regdump_len = uec_get_regs_len(netdev);
 }
@@ -373,10 +377,8 @@ 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_sset_count         = uec_get_sset_count,
         .get_strings            = uec_get_strings,
         .get_ethtool_stats      = uec_get_ethtool_stats,
 };