Skip to content

Commit

Permalink
[netdrvr] Stop using legacy hooks ->self_test_count, ->get_stats_count
Browse files Browse the repository at this point in the history 
These have been superceded by the new ->get_sset_count() hook.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jeff Garzik authored and David S. Miller committed Oct 10, 2007
1 parent 753f492 commit b9f2c04
Show file tree
Hide file tree
Showing 35 changed files with 345 additions and 245 deletions.
11 changes: 8 additions & 3 deletions drivers/net/3c59x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2833,9 +2833,14 @@ static void vortex_set_msglevel(struct net_device *dev, u32 dbg)
vortex_debug = dbg;
}

static int vortex_get_stats_count(struct net_device *dev)
static int vortex_get_sset_count(struct net_device *dev, int sset)
{
return VORTEX_NUM_STATS;
switch (sset) {
case ETH_SS_STATS:
return VORTEX_NUM_STATS;
default:
return -EOPNOTSUPP;
}
}

static void vortex_get_ethtool_stats(struct net_device *dev,
Expand Down Expand Up @@ -2892,7 +2897,7 @@ static const struct ethtool_ops vortex_ethtool_ops = {
.get_msglevel = vortex_get_msglevel,
.set_msglevel = vortex_set_msglevel,
.get_ethtool_stats = vortex_get_ethtool_stats,
.get_stats_count = vortex_get_stats_count,
.get_sset_count = vortex_get_sset_count,
.get_settings = vortex_get_settings,
.set_settings = vortex_set_settings,
.get_link = ethtool_op_get_link,
Expand Down
11 changes: 8 additions & 3 deletions drivers/net/8139cp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1383,9 +1383,14 @@ static int cp_get_regs_len(struct net_device *dev)
return CP_REGS_SIZE;
}

static int cp_get_stats_count (struct net_device *dev)
static int cp_get_sset_count (struct net_device *dev, int sset)
{
return CP_NUM_STATS;
switch (sset) {
case ETH_SS_STATS:
return CP_NUM_STATS;
default:
return -EOPNOTSUPP;
}
}

static int cp_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
Expand Down Expand Up @@ -1563,7 +1568,7 @@ static void cp_get_ethtool_stats (struct net_device *dev,
static const struct ethtool_ops cp_ethtool_ops = {
.get_drvinfo = cp_get_drvinfo,
.get_regs_len = cp_get_regs_len,
.get_stats_count = cp_get_stats_count,
.get_sset_count = cp_get_sset_count,
.get_settings = cp_get_settings,
.set_settings = cp_set_settings,
.nway_reset = cp_nway_reset,
Expand Down
11 changes: 8 additions & 3 deletions drivers/net/8139too.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2406,9 +2406,14 @@ static void rtl8139_get_regs(struct net_device *dev, struct ethtool_regs *regs,
}
#endif /* CONFIG_8139TOO_MMIO */

static int rtl8139_get_stats_count(struct net_device *dev)
static int rtl8139_get_sset_count(struct net_device *dev, int sset)
{
return RTL_NUM_STATS;
switch (sset) {
case ETH_SS_STATS:
return RTL_NUM_STATS;
default:
return -EOPNOTSUPP;
}
}

static void rtl8139_get_ethtool_stats(struct net_device *dev, struct ethtool_stats *stats, u64 *data)
Expand Down Expand Up @@ -2439,7 +2444,7 @@ static const struct ethtool_ops rtl8139_ethtool_ops = {
.get_wol = rtl8139_get_wol,
.set_wol = rtl8139_set_wol,
.get_strings = rtl8139_get_strings,
.get_stats_count = rtl8139_get_stats_count,
.get_sset_count = rtl8139_get_sset_count,
.get_ethtool_stats = rtl8139_get_ethtool_stats,
};

Expand Down
11 changes: 8 additions & 3 deletions drivers/net/atl1/atl1_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,14 @@ static void atl1_get_ethtool_stats(struct net_device *netdev,

}

static int atl1_get_stats_count(struct net_device *netdev)
static int atl1_get_sset_count(struct net_device *netdev, int sset)
{
return ARRAY_SIZE(atl1_gstrings_stats);
switch (sset) {
case ETH_SS_STATS:
return ARRAY_SIZE(atl1_gstrings_stats);
default:
return -EOPNOTSUPP;
}
}

static int atl1_get_settings(struct net_device *netdev,
Expand Down Expand Up @@ -495,6 +500,6 @@ const struct ethtool_ops atl1_ethtool_ops = {
.get_strings = atl1_get_strings,
.nway_reset = atl1_nway_reset,
.get_ethtool_stats = atl1_get_ethtool_stats,
.get_stats_count = atl1_get_stats_count,
.get_sset_count = atl1_get_sset_count,
.set_tso = ethtool_op_set_tso,
};
11 changes: 8 additions & 3 deletions drivers/net/b44.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1962,9 +1962,14 @@ static void b44_get_strings(struct net_device *dev, u32 stringset, u8 *data)
}
}

static int b44_get_stats_count(struct net_device *dev)
static int b44_get_sset_count(struct net_device *dev, int sset)
{
return ARRAY_SIZE(b44_gstrings);
switch (sset) {
case ETH_SS_STATS:
return ARRAY_SIZE(b44_gstrings);
default:
return -EOPNOTSUPP;
}
}

static void b44_get_ethtool_stats(struct net_device *dev,
Expand Down Expand Up @@ -2025,7 +2030,7 @@ static const struct ethtool_ops b44_ethtool_ops = {
.get_msglevel = b44_get_msglevel,
.set_msglevel = b44_set_msglevel,
.get_strings = b44_get_strings,
.get_stats_count = b44_get_stats_count,
.get_sset_count = b44_get_sset_count,
.get_ethtool_stats = b44_get_ethtool_stats,
};

Expand Down
20 changes: 10 additions & 10 deletions drivers/net/bnx2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6068,9 +6068,16 @@ static struct {
};

static int
bnx2_self_test_count(struct net_device *dev)
bnx2_get_sset_count(struct net_device *dev, int sset)
{
return BNX2_NUM_TESTS;
switch (sset) {
case ETH_SS_TEST:
return BNX2_NUM_TESTS;
case ETH_SS_STATS:
return BNX2_NUM_STATS;
default:
return -EOPNOTSUPP;
}
}

static void
Expand Down Expand Up @@ -6144,12 +6151,6 @@ bnx2_get_strings(struct net_device *dev, u32 stringset, u8 *buf)
}
}

static int
bnx2_get_stats_count(struct net_device *dev)
{
return BNX2_NUM_STATS;
}

static void
bnx2_get_ethtool_stats(struct net_device *dev,
struct ethtool_stats *stats, u64 *buf)
Expand Down Expand Up @@ -6260,12 +6261,11 @@ static const struct ethtool_ops bnx2_ethtool_ops = {
.set_tx_csum = bnx2_set_tx_csum,
.set_sg = ethtool_op_set_sg,
.set_tso = bnx2_set_tso,
.self_test_count = bnx2_self_test_count,
.self_test = bnx2_self_test,
.get_strings = bnx2_get_strings,
.phys_id = bnx2_phys_id,
.get_stats_count = bnx2_get_stats_count,
.get_ethtool_stats = bnx2_get_ethtool_stats,
.get_sset_count = bnx2_get_sset_count,
};

/* Called with rtnl_lock */
Expand Down
11 changes: 8 additions & 3 deletions drivers/net/cassini.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4772,9 +4772,14 @@ static void cas_get_regs(struct net_device *dev, struct ethtool_regs *regs,
cas_read_regs(cp, p, regs->len / sizeof(u32));
}

static int cas_get_stats_count(struct net_device *dev)
static int cas_get_sset_count(struct net_device *dev, int sset)
{
return CAS_NUM_STAT_KEYS;
switch (sset) {
case ETH_SS_STATS:
return CAS_NUM_STAT_KEYS;
default:
return -EOPNOTSUPP;
}
}

static void cas_get_strings(struct net_device *dev, u32 stringset, u8 *data)
Expand Down Expand Up @@ -4818,7 +4823,7 @@ static const struct ethtool_ops cas_ethtool_ops = {
.set_msglevel = cas_set_msglevel,
.get_regs_len = cas_get_regs_len,
.get_regs = cas_get_regs,
.get_stats_count = cas_get_stats_count,
.get_sset_count = cas_get_sset_count,
.get_strings = cas_get_strings,
.get_ethtool_stats = cas_get_ethtool_stats,
};
Expand Down
11 changes: 8 additions & 3 deletions drivers/net/chelsio/cxgb2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,14 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
strcpy(info->bus_info, pci_name(adapter->pdev));
}

static int get_stats_count(struct net_device *dev)
static int get_sset_count(struct net_device *dev, int sset)
{
return ARRAY_SIZE(stats_strings);
switch (sset) {
case ETH_SS_STATS:
return ARRAY_SIZE(stats_strings);
default:
return -EOPNOTSUPP;
}
}

static void get_strings(struct net_device *dev, u32 stringset, u8 *data)
Expand Down Expand Up @@ -798,7 +803,7 @@ static const struct ethtool_ops t1_ethtool_ops = {
.set_sg = ethtool_op_set_sg,
.get_link = ethtool_op_get_link,
.get_strings = get_strings,
.get_stats_count = get_stats_count,
.get_sset_count = get_sset_count,
.get_ethtool_stats = get_stats,
.get_regs_len = get_regs_len,
.get_regs = get_regs,
Expand Down
11 changes: 8 additions & 3 deletions drivers/net/cxgb3/cxgb3_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1131,9 +1131,14 @@ static char stats_strings[][ETH_GSTRING_LEN] = {

};

static int get_stats_count(struct net_device *dev)
static int get_sset_count(struct net_device *dev, int sset)
{
return ARRAY_SIZE(stats_strings);
switch (sset) {
case ETH_SS_STATS:
return ARRAY_SIZE(stats_strings);
default:
return -EOPNOTSUPP;
}
}

#define T3_REGMAP_SIZE (3 * 1024)
Expand Down Expand Up @@ -1640,7 +1645,7 @@ static const struct ethtool_ops cxgb_ethtool_ops = {
.get_strings = get_strings,
.phys_id = cxgb3_phys_id,
.nway_reset = restart_autoneg,
.get_stats_count = get_stats_count,
.get_sset_count = get_sset_count,
.get_ethtool_stats = get_stats,
.get_regs_len = get_regs_len,
.get_regs = get_regs,
Expand Down
19 changes: 10 additions & 9 deletions drivers/net/e100.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2374,11 +2374,6 @@ static const char e100_gstrings_test[][ETH_GSTRING_LEN] = {
};
#define E100_TEST_LEN sizeof(e100_gstrings_test) / ETH_GSTRING_LEN

static int e100_diag_test_count(struct net_device *netdev)
{
return E100_TEST_LEN;
}

static void e100_diag_test(struct net_device *netdev,
struct ethtool_test *test, u64 *data)
{
Expand Down Expand Up @@ -2441,9 +2436,16 @@ static const char e100_gstrings_stats[][ETH_GSTRING_LEN] = {
#define E100_NET_STATS_LEN 21
#define E100_STATS_LEN sizeof(e100_gstrings_stats) / ETH_GSTRING_LEN

static int e100_get_stats_count(struct net_device *netdev)
static int e100_get_sset_count(struct net_device *netdev, int sset)
{
return E100_STATS_LEN;
switch (sset) {
case ETH_SS_TEST:
return E100_TEST_LEN;
case ETH_SS_STATS:
return E100_STATS_LEN;
default:
return -EOPNOTSUPP;
}
}

static void e100_get_ethtool_stats(struct net_device *netdev,
Expand Down Expand Up @@ -2494,12 +2496,11 @@ static const struct ethtool_ops e100_ethtool_ops = {
.set_eeprom = e100_set_eeprom,
.get_ringparam = e100_get_ringparam,
.set_ringparam = e100_set_ringparam,
.self_test_count = e100_diag_test_count,
.self_test = e100_diag_test,
.get_strings = e100_get_strings,
.phys_id = e100_phys_id,
.get_stats_count = e100_get_stats_count,
.get_ethtool_stats = e100_get_ethtool_stats,
.get_sset_count = e100_get_sset_count,
};

static int e100_do_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
Expand Down
22 changes: 10 additions & 12 deletions drivers/net/e1000/e1000_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -618,8 +618,6 @@ e1000_get_drvinfo(struct net_device *netdev,

strncpy(drvinfo->fw_version, firmware_version, 32);
strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
drvinfo->n_stats = E1000_STATS_LEN;
drvinfo->testinfo_len = E1000_TEST_LEN;
drvinfo->regdump_len = e1000_get_regs_len(netdev);
drvinfo->eedump_len = e1000_get_eeprom_len(netdev);
}
Expand Down Expand Up @@ -1611,9 +1609,16 @@ e1000_link_test(struct e1000_adapter *adapter, uint64_t *data)
}

static int
e1000_diag_test_count(struct net_device *netdev)
e1000_get_sset_count(struct net_device *netdev, int sset)
{
return E1000_TEST_LEN;
switch (sset) {
case ETH_SS_TEST:
return E1000_TEST_LEN;
case ETH_SS_STATS:
return E1000_STATS_LEN;
default:
return -EOPNOTSUPP;
}
}

extern void e1000_power_up_phy(struct e1000_adapter *);
Expand Down Expand Up @@ -1898,12 +1903,6 @@ e1000_nway_reset(struct net_device *netdev)
return 0;
}

static int
e1000_get_stats_count(struct net_device *netdev)
{
return E1000_STATS_LEN;
}

static void
e1000_get_ethtool_stats(struct net_device *netdev,
struct ethtool_stats *stats, uint64_t *data)
Expand Down Expand Up @@ -1967,12 +1966,11 @@ static const struct ethtool_ops e1000_ethtool_ops = {
.set_tx_csum = e1000_set_tx_csum,
.set_sg = ethtool_op_set_sg,
.set_tso = e1000_set_tso,
.self_test_count = e1000_diag_test_count,
.self_test = e1000_diag_test,
.get_strings = e1000_get_strings,
.phys_id = e1000_phys_id,
.get_stats_count = e1000_get_stats_count,
.get_ethtool_stats = e1000_get_ethtool_stats,
.get_sset_count = e1000_get_sset_count,
};

void e1000_set_ethtool_ops(struct net_device *netdev)
Expand Down
Loading

0 comments on commit b9f2c04

Please sign in to comment.