Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41303314 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa-serdes-stats' 



Andrew Lunn says:

====================
Export SERDES stats via ethtool -S

The mv88e6352 family has a SERDES interface which can be used for
example to connect to SFF/SFP modules. This interface has a couple of
statistics counters. Add support for including these counters in the
output of ethtool -S.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents efab163b cda9f4aa

drivers/net/dsa/b53/b53_common.c

+1 −1
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ void b53_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data) 
}

EXPORT_SYMBOL(b53_get_ethtool_stats);



int b53_get_sset_count(struct dsa_switch *ds)

int b53_get_sset_count(struct dsa_switch *ds, int port)

{

	struct b53_device *dev = ds->priv;

drivers/net/dsa/b53/b53_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ void b53_imp_vlan_setup(struct dsa_switch *ds, int cpu_port); 
int b53_configure_vlan(struct dsa_switch *ds);

void b53_get_strings(struct dsa_switch *ds, int port, uint8_t *data);

void b53_get_ethtool_stats(struct dsa_switch *ds, int port, uint64_t *data);

int b53_get_sset_count(struct dsa_switch *ds);

int b53_get_sset_count(struct dsa_switch *ds, int port);

int b53_br_join(struct dsa_switch *ds, int port, struct net_device *bridge);

void b53_br_leave(struct dsa_switch *ds, int port, struct net_device *bridge);

void b53_br_set_stp_state(struct dsa_switch *ds, int port, u8 state);

drivers/net/dsa/dsa_loop.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int dsa_loop_setup(struct dsa_switch *ds) 
	return 0;

}



static int dsa_loop_get_sset_count(struct dsa_switch *ds)

static int dsa_loop_get_sset_count(struct dsa_switch *ds, int port)

{

	return __DSA_LOOP_CNT_MAX;

}

drivers/net/dsa/lan9303-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ static void lan9303_get_ethtool_stats(struct dsa_switch *ds, int port, 
	}

}



static int lan9303_get_sset_count(struct dsa_switch *ds)

static int lan9303_get_sset_count(struct dsa_switch *ds, int port)

{

	return ARRAY_SIZE(lan9303_mib);

}

drivers/net/dsa/microchip/ksz_common.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static void ksz_disable_port(struct dsa_switch *ds, int port, 
	ksz_port_cfg(dev, port, REG_PORT_CTRL_0, PORT_MAC_LOOPBACK, true);

}



static int ksz_sset_count(struct dsa_switch *ds)

static int ksz_sset_count(struct dsa_switch *ds, int port)

{

	return TOTAL_SWITCH_COUNTER_NUM;

}