diff options
| author | Vladimir Oltean <vladimir.oltean@nxp.com> | 2021-10-20 20:49:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-10-21 12:44:07 +0100 |
| commit | 992e5cc7be8e693aba1f0ee7905d34c87fd7872a (patch) | |
| tree | 167f32ab40c2d7e529b6cd075d6fd2105cb9c4a4 /drivers/net/dsa | |
| parent | 5068887a4fbe11ed239a8a409bbde82a3317882a (diff) | |
| download | linux-992e5cc7be8e693aba1f0ee7905d34c87fd7872a.tar.gz linux-992e5cc7be8e693aba1f0ee7905d34c87fd7872a.tar.bz2 linux-992e5cc7be8e693aba1f0ee7905d34c87fd7872a.zip | |
net: dsa: tag_8021q: make dsa_8021q_{rx,tx}_vid take dp as argument
Pass a single argument to dsa_8021q_rx_vid and dsa_8021q_tx_vid that
contains the necessary information from the two arguments that are
currently provided: the switch and the port number.
Also rename those functions so that they have a dsa_port_* prefix, since
they operate on a struct dsa_port *.
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa')
| -rw-r--r-- | drivers/net/dsa/sja1105/sja1105_vl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/dsa/sja1105/sja1105_vl.c b/drivers/net/dsa/sja1105/sja1105_vl.c index d55572994e1f..f5dca6a9b0f9 100644 --- a/drivers/net/dsa/sja1105/sja1105_vl.c +++ b/drivers/net/dsa/sja1105/sja1105_vl.c @@ -394,7 +394,8 @@ static int sja1105_init_virtual_links(struct sja1105_private *priv, vl_lookup[k].vlanid = rule->key.vl.vid; vl_lookup[k].vlanprior = rule->key.vl.pcp; } else { - u16 vid = dsa_8021q_rx_vid(priv->ds, port); + struct dsa_port *dp = dsa_to_port(priv->ds, port); + u16 vid = dsa_tag_8021q_rx_vid(dp); vl_lookup[k].vlanid = vid; vl_lookup[k].vlanprior = 0; |