diff mbox

bcm63xx_enet: fix compilation failure after get_stats_count removal

Message ID 200912151745.06131.ffainelli@freebox.fr
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Florian Fainelli Dec. 15, 2009, 4:45 p.m. UTC 
Hi David,

This build failure is present in both 2.6.32 and net-next-2.6. Thanks!
---
From: Florian Fainelli <ffainelli@freebox.fr>
Subject: [PATCH] bcm63xx_enet: fix compilation failure after get_stats_count removal

This patch converts bcm63xx_enet to uset get_sset_count
like the other drivers do.

Signed-off-by: Florian Fainelli <ffainelli@freebox.fr>
Cc: stable@kernel.org
---

Comments

David Miller Dec. 16, 2009, 5:13 a.m. UTC | #1 
From: Florian Fainelli <ffainelli@freebox.fr>
Date: Tue, 15 Dec 2009 17:45:06 +0100

> Subject: [PATCH] bcm63xx_enet: fix compilation failure after get_stats_count removal
> 
> This patch converts bcm63xx_enet to uset get_sset_count
> like the other drivers do.
> 
> Signed-off-by: Florian Fainelli <ffainelli@freebox.fr>

Applied, and queued up for -stable, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index 1f6c548..0bd47d3 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/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,