diff options
| author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2017-09-29 17:19:18 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-10-01 04:15:07 +0100 |
| commit | 152402483ed75b167d5628d414e876ffa7a6d4c4 (patch) | |
| tree | 19cbdba3c8720900a35bddf92da7d75052a9fff4 /net/dsa/slave.c | |
| parent | 62fc95876298987c35e9fb10badd467f4787aae7 (diff) | |
| download | linux-152402483ed75b167d5628d414e876ffa7a6d4c4.tar.gz linux-152402483ed75b167d5628d414e876ffa7a6d4c4.tar.bz2 linux-152402483ed75b167d5628d414e876ffa7a6d4c4.zip | |
net: dsa: add tagging ops to port
The DSA tagging protocol operations are specific to each CPU port,
thus the dsa_device_ops pointer belongs to the dsa_port structure.
>From now on assign a slave's xmit copy from its CPU port tagging
operations. This will ease the future support for multiple CPU ports.
Also keep the tag_ops at the beginning of the dsa_port structure so that
we ensure copies for hot path are in cacheline 1.
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/slave.c')
| -rw-r--r-- | net/dsa/slave.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index bf8800de13c1..4b634db05cee 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1117,7 +1117,6 @@ int dsa_slave_resume(struct net_device *slave_dev) int dsa_slave_create(struct dsa_port *port, const char *name) { struct dsa_switch *ds = port->ds; - struct dsa_switch_tree *dst = ds->dst; struct net_device *master; struct net_device *slave_dev; struct dsa_slave_priv *p; @@ -1162,7 +1161,7 @@ int dsa_slave_create(struct dsa_port *port, const char *name) } p->dp = port; INIT_LIST_HEAD(&p->mall_tc_list); - p->xmit = dst->tag_ops->xmit; + p->xmit = cpu_dp->tag_ops->xmit; p->old_pause = -1; p->old_link = -1; |