Revert "net: dsa: Add more convenient functions for installing port VLANs"
authorVladimir Oltean <vladimir.oltean@nxp.com>
Thu, 10 Sep 2020 16:48:57 +0000 (19:48 +0300)
committerDavid S. Miller <davem@davemloft.net>
Sat, 12 Sep 2020 00:30:43 +0000 (17:30 -0700)
commit88236591ec3bc6fbf4393b435ea8f567e06faede
tree2c3c10bbf14b3df90fc6d2877810802deafc7058
parent5899ee367ab3fec885aa04d9a2b573bf2e464e7f
Revert "net: dsa: Add more convenient functions for installing port VLANs"

This reverts commit 314f76d7a68bab0516aa52877944e6aacfa0fc3f.

Citing that commit message, the call graph was:

    dsa_slave_vlan_rx_add_vid   dsa_port_setup_8021q_tagging
                |                        |
                |                        |
                |          +-------------+
                |          |
                v          v
               dsa_port_vid_add      dsa_slave_port_obj_add
                      |                         |
                      +-------+         +-------+
                              |         |
                              v         v
                           dsa_port_vlan_add

Now that tag_8021q has its own ops structure, it no longer relies on
dsa_port_vid_add, and therefore on the dsa_switch_ops to install its
VLANs.

So dsa_port_vid_add now only has one single caller. So we can simplify
the call graph to what it was before, aka:

        dsa_slave_vlan_rx_add_vid     dsa_slave_port_obj_add
                      |                         |
                      +-------+         +-------+
                              |         |
                              v         v
                           dsa_port_vlan_add

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/dsa/dsa_priv.h
net/dsa/port.c
net/dsa/slave.c