p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: dsa: use cpu_dp in master code 

Make it clear that the master device is linked to a CPU port by using
"cpu_dp" for the dsa_port variable in master.c instead of "port", then
use a "port" variable to describe the port index, as usually seen in
other places of DSA core.

This will make the future patch touching dsa_ptr more readable. There is
no functional changes.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2017-09-29 17:19:16 -04:00 committed by David S. Miller
parent 3775b1b7f0
commit 7ec764eef9
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
net/dsa/master.c
View File

@ -17,9 +17,10 @@ static void dsa_master_get_ethtool_stats(struct net_device *dev,
uint64_t *data) uint64_t *data)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_port *port = dst->cpu_dp; struct dsa_port *cpu_dp = dst->cpu_dp;
struct dsa_switch *ds = port->ds; const struct ethtool_ops *ops = cpu_dp->orig_ethtool_ops;
const struct ethtool_ops *ops = port->orig_ethtool_ops; struct dsa_switch *ds = cpu_dp->ds;
int port = cpu_dp->index;
int count = 0; int count = 0;
if (ops && ops->get_sset_count && ops->get_ethtool_stats) { if (ops && ops->get_sset_count && ops->get_ethtool_stats) {
@ -28,15 +29,15 @@ static void dsa_master_get_ethtool_stats(struct net_device *dev,
} }
if (ds->ops->get_ethtool_stats) if (ds->ops->get_ethtool_stats)
ds->ops->get_ethtool_stats(ds, port->index, data + count); ds->ops->get_ethtool_stats(ds, port, data + count);
} }
static int dsa_master_get_sset_count(struct net_device *dev, int sset) static int dsa_master_get_sset_count(struct net_device *dev, int sset)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_port *port = dst->cpu_dp; struct dsa_port *cpu_dp = dst->cpu_dp;
struct dsa_switch *ds = port->ds; const struct ethtool_ops *ops = cpu_dp->orig_ethtool_ops;
const struct ethtool_ops *ops = port->orig_ethtool_ops; struct dsa_switch *ds = cpu_dp->ds;
int count = 0; int count = 0;
if (ops && ops->get_sset_count) if (ops && ops->get_sset_count)
@ -52,16 +53,17 @@ static void dsa_master_get_strings(struct net_device *dev, uint32_t stringset,
uint8_t *data) uint8_t *data)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_port *port = dst->cpu_dp; struct dsa_port *cpu_dp = dst->cpu_dp;
struct dsa_switch *ds = port->ds; const struct ethtool_ops *ops = cpu_dp->orig_ethtool_ops;
const struct ethtool_ops *ops = port->orig_ethtool_ops; struct dsa_switch *ds = cpu_dp->ds;
int port = cpu_dp->index;
int len = ETH_GSTRING_LEN; int len = ETH_GSTRING_LEN;
int mcount = 0, count; int mcount = 0, count;
unsigned int i; unsigned int i;
uint8_t pfx[4]; uint8_t pfx[4];
uint8_t *ndata; uint8_t *ndata;
snprintf(pfx, sizeof(pfx), "p%.2d", port->index); snprintf(pfx, sizeof(pfx), "p%.2d", port);
/* We do not want to be NULL-terminated, since this is a prefix */ /* We do not want to be NULL-terminated, since this is a prefix */
pfx[sizeof(pfx) - 1] = '_'; pfx[sizeof(pfx) - 1] = '_';
@ -76,7 +78,7 @@ static void dsa_master_get_strings(struct net_device *dev, uint32_t stringset,
* the output after to prepend our CPU port prefix we * the output after to prepend our CPU port prefix we
* constructed earlier * constructed earlier
*/ */
ds->ops->get_strings(ds, port->index, ndata); ds->ops->get_strings(ds, port, ndata);
count = ds->ops->get_sset_count(ds); count = ds->ops->get_sset_count(ds);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
memmove(ndata + (i * len + sizeof(pfx)), memmove(ndata + (i * len + sizeof(pfx)),
@ -89,17 +91,17 @@ static void dsa_master_get_strings(struct net_device *dev, uint32_t stringset,
int dsa_master_ethtool_setup(struct net_device *dev) int dsa_master_ethtool_setup(struct net_device *dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_port *port = dst->cpu_dp; struct dsa_port *cpu_dp = dst->cpu_dp;
struct dsa_switch *ds = port->ds; struct dsa_switch *ds = cpu_dp->ds;
struct ethtool_ops *ops; struct ethtool_ops *ops;
ops = devm_kzalloc(ds->dev, sizeof(*ops), GFP_KERNEL); ops = devm_kzalloc(ds->dev, sizeof(*ops), GFP_KERNEL);
if (!ops) if (!ops)
return -ENOMEM; return -ENOMEM;
port->orig_ethtool_ops = dev->ethtool_ops; cpu_dp->orig_ethtool_ops = dev->ethtool_ops;
if (port->orig_ethtool_ops) if (cpu_dp->orig_ethtool_ops)
memcpy(ops, port->orig_ethtool_ops, sizeof(*ops)); memcpy(ops, cpu_dp->orig_ethtool_ops, sizeof(*ops));
ops->get_sset_count = dsa_master_get_sset_count; ops->get_sset_count = dsa_master_get_sset_count;
ops->get_ethtool_stats = dsa_master_get_ethtool_stats; ops->get_ethtool_stats = dsa_master_get_ethtool_stats;
@ -113,8 +115,8 @@ int dsa_master_ethtool_setup(struct net_device *dev)
void dsa_master_ethtool_restore(struct net_device *dev) void dsa_master_ethtool_restore(struct net_device *dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_port *port = dst->cpu_dp; struct dsa_port *cpu_dp = dst->cpu_dp;
dev->ethtool_ops = port->orig_ethtool_ops; dev->ethtool_ops = cpu_dp->orig_ethtool_ops;
port->orig_ethtool_ops = NULL; cpu_dp->orig_ethtool_ops = NULL;
} }