Skip to contentSkip to conversation

bcm63xx_enet: fix compilation failure after get_stats_count removal

PATCH Applied Florian Fainelli 2 participants 2 messages Dec 15, 2009 – Dec 16, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bcm63xx_enet: fix compilation failure after get_stats_count removal

Hi David,

This build failure is present in both 2.6.32 and net-next-2.6. Thanks!
---
From: Florian Fainelli <[email protected]>
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.

---

drivers/net/bcm63xx_enet.c +9 -3
index 1f6c548..0bd47d3 100644
@@ -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,
Signature · 1 line
1.6.3.3
maintainer Applied
#1 lore raw

From: Florian Fainelli <[email protected]>
Date: Tue, 15 Dec 2009 17:45:06 +0100

Quoted 6 lines

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.

Applied, and queued up for -stable, thanks.