From 3782d35255dc59a0af6b7172da830a5500c8513a Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 15 Dec 2009 06:45:06 +0000 Subject: [PATCH] --- yaml --- r: 177161 b: refs/heads/master c: a3f92eea04101d9a8e14d50f8048cc5b7bca07a8 h: refs/heads/master i: 177159: 05392006d6dad7f36994fe8901111118878e4a05 v: v3 --- [refs] | 2 +- trunk/drivers/net/bcm63xx_enet.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a52d9933401d..2afe2efcd0f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a35ca80c1db7279c3c0655063f6d3490e399b17 +refs/heads/master: a3f92eea04101d9a8e14d50f8048cc5b7bca07a8 diff --git a/trunk/drivers/net/bcm63xx_enet.c b/trunk/drivers/net/bcm63xx_enet.c index 1f6c5486d715..0bd47d32ec42 100644 --- a/trunk/drivers/net/bcm63xx_enet.c +++ b/trunk/drivers/net/bcm63xx_enet.c @@ -1245,9 +1245,15 @@ static void bcm_enet_get_drvinfo(struct net_device *netdev, drvinfo->n_stats = BCM_ENET_STATS_LEN; } -static int bcm_enet_get_stats_count(struct net_device *netdev) +static int bcm_enet_get_sset_count(struct net_device *netdev, + int string_set) { - return BCM_ENET_STATS_LEN; + switch (string_set) { + case ETH_SS_STATS: + return BCM_ENET_STATS_LEN; + default: + return -EINVAL; + } } static void bcm_enet_get_strings(struct net_device *netdev, @@ -1473,7 +1479,7 @@ static int bcm_enet_set_pauseparam(struct net_device *dev, static struct ethtool_ops bcm_enet_ethtool_ops = { .get_strings = bcm_enet_get_strings, - .get_stats_count = bcm_enet_get_stats_count, + .get_sset_count = bcm_enet_get_sset_count, .get_ethtool_stats = bcm_enet_get_ethtool_stats, .get_settings = bcm_enet_get_settings, .set_settings = bcm_enet_set_settings,