netdev - Re: [PATCH 1/4] qeth: Convert ethtool get_stats_count() ops to get_sset

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4AC5EE51.7060403@linux.vnet.ibm.com>
Date:	Fri, 02 Oct 2009 14:13:05 +0200
From:	Frank Blaschka <blaschka@...ux.vnet.ibm.com>
To:	Ben Hutchings <bhutchings@...arflare.com>
CC:	David Miller <davem@...emloft.net>,
	Ursula Braun <ursula.braun@...ibm.com>,
	Frank Blaschka <frank.blaschka@...ibm.com>,
	linux-s390@...r.kernel.org, netdev@...r.kernel.org
Subject: Re: [PATCH 1/4] qeth: Convert ethtool get_stats_count() ops to get_sset_count()

works fine, thanks a lot here is my ACK

Ben Hutchings schrieb:
> This string query operation was supposed to be replaced by the
> generic get_sset_count() starting in 2007.  Convert qeth's
> implementation.
> 
> Signed-off-by: Ben Hutchings <bhutchings@...arflare.com>
> ---
> This is not even compile-tested because I don't have an s390 compiler.
> But it's simple enough that I think I got it right...
> 
> Ben.
> 
>  drivers/s390/net/qeth_core.h      |    2 +-
>  drivers/s390/net/qeth_core_main.c |   11 ++++++++---
>  drivers/s390/net/qeth_l2_main.c   |    4 ++--
>  drivers/s390/net/qeth_l3_main.c   |    2 +-
>  4 files changed, 12 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
> index 31a2b4e..e8f72d7 100644
> --- a/drivers/s390/net/qeth_core.h
> +++ b/drivers/s390/net/qeth_core.h
> @@ -849,7 +849,7 @@ int qeth_do_send_packet_fast(struct qeth_card *, struct qeth_qdio_out_q *,
>  			struct sk_buff *, struct qeth_hdr *, int, int, int);
>  int qeth_do_send_packet(struct qeth_card *, struct qeth_qdio_out_q *,
>  		    struct sk_buff *, struct qeth_hdr *, int);
> -int qeth_core_get_stats_count(struct net_device *);
> +int qeth_core_get_sset_count(struct net_device *, int);
>  void qeth_core_get_ethtool_stats(struct net_device *,
>  				struct ethtool_stats *, u64 *);
>  void qeth_core_get_strings(struct net_device *, u32, u8 *);
> diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
> index c4a42d9..edee4dc 100644
> --- a/drivers/s390/net/qeth_core_main.c
> +++ b/drivers/s390/net/qeth_core_main.c
> @@ -4305,11 +4305,16 @@ static struct {
>  	{"tx csum"},
>  };
> 
> -int qeth_core_get_stats_count(struct net_device *dev)
> +int qeth_core_get_sset_count(struct net_device *dev, int stringset)
>  {
> -	return (sizeof(qeth_ethtool_stats_keys) / ETH_GSTRING_LEN);
> +	switch (stringset) {
> +	case ETH_SS_STATS:
> +		return (sizeof(qeth_ethtool_stats_keys) / ETH_GSTRING_LEN);
> +	default:
> +		return -EINVAL;
> +	}
>  }
> -EXPORT_SYMBOL_GPL(qeth_core_get_stats_count);
> +EXPORT_SYMBOL_GPL(qeth_core_get_sset_count);
> 
>  void qeth_core_get_ethtool_stats(struct net_device *dev,
>  		struct ethtool_stats *stats, u64 *data)
> diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
> index f4f3ca1..b61d5c7 100644
> --- a/drivers/s390/net/qeth_l2_main.c
> +++ b/drivers/s390/net/qeth_l2_main.c
> @@ -866,7 +866,7 @@ static const struct ethtool_ops qeth_l2_ethtool_ops = {
>  	.get_link = ethtool_op_get_link,
>  	.get_strings = qeth_core_get_strings,
>  	.get_ethtool_stats = qeth_core_get_ethtool_stats,
> -	.get_stats_count = qeth_core_get_stats_count,
> +	.get_sset_count = qeth_core_get_sset_count,
>  	.get_drvinfo = qeth_core_get_drvinfo,
>  	.get_settings = qeth_core_ethtool_get_settings,
>  };
> @@ -874,7 +874,7 @@ static const struct ethtool_ops qeth_l2_ethtool_ops = {
>  static const struct ethtool_ops qeth_l2_osn_ops = {
>  	.get_strings = qeth_core_get_strings,
>  	.get_ethtool_stats = qeth_core_get_ethtool_stats,
> -	.get_stats_count = qeth_core_get_stats_count,
> +	.get_sset_count = qeth_core_get_sset_count,
>  	.get_drvinfo = qeth_core_get_drvinfo,
>  };
> 
> diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
> index 073b6d3..4ca28c1 100644
> --- a/drivers/s390/net/qeth_l3_main.c
> +++ b/drivers/s390/net/qeth_l3_main.c
> @@ -2957,7 +2957,7 @@ static const struct ethtool_ops qeth_l3_ethtool_ops = {
>  	.set_tso     = qeth_l3_ethtool_set_tso,
>  	.get_strings = qeth_core_get_strings,
>  	.get_ethtool_stats = qeth_core_get_ethtool_stats,
> -	.get_stats_count = qeth_core_get_stats_count,
> +	.get_sset_count = qeth_core_get_sset_count,
>  	.get_drvinfo = qeth_core_get_drvinfo,
>  	.get_settings = qeth_core_ethtool_get_settings,
>  };
> 


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html