lkml.org 
[lkml]   [2009]   [Dec]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[136/151] bcm63xx_enet: fix compilation failure after get_stats_count removal
    2.6.32-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Florian Fainelli <ffainelli@freebox.fr>

    commit a3f92eea04101d9a8e14d50f8048cc5b7bca07a8 upstream.

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

    Signed-off-by: Florian Fainelli <ffainelli@freebox.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/net/bcm63xx_enet.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    --- a/drivers/net/bcm63xx_enet.c
    +++ b/drivers/net/bcm63xx_enet.c
    @@ -1248,9 +1248,15 @@ static void bcm_enet_get_drvinfo(struct
    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,
    @@ -1476,7 +1482,7 @@ static int bcm_enet_set_pauseparam(struc

    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,



    \
     
     \ /
      Last update: 2009-12-17 05:19    [W:0.019 / U:30.952 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site