qeth: Convert ethtool get_stats_count() ops to get_sset_count()
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@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
374576a8b6
commit
df8b4ec8b1
|
@ -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 *);
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue