* [PATCH] bcm63xx_enet: fix compilation failure after get_stats_count removal
@ 2009-12-15 16:45 Florian Fainelli
2009-12-16 5:13 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Florian Fainelli @ 2009-12-15 16:45 UTC (permalink / raw)
To: netdev; +Cc: stable, David Miller, Maxime Bizon
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
---
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,
--
1.6.3.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] bcm63xx_enet: fix compilation failure after get_stats_count removal
2009-12-15 16:45 [PATCH] bcm63xx_enet: fix compilation failure after get_stats_count removal Florian Fainelli
@ 2009-12-16 5:13 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2009-12-16 5:13 UTC (permalink / raw)
To: ffainelli; +Cc: netdev, stable, mbizon
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-12-16 5:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-15 16:45 [PATCH] bcm63xx_enet: fix compilation failure after get_stats_count removal Florian Fainelli
2009-12-16 5:13 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).