net: dsa: Remove support for bypass bridge port attributes/vlan set

The bridge port attributes/vlan for DSA devices should be set only
from bridge code. Furthermore, The vlans are synced totally with the
bridge so there is no need for special dump support.

Signed-off-by: Arkadi Sharshevsky <arkadis@mellanox.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 446fc438cb8034bb55fc17b37990b622484fd101..d7b9bdd0e768f6ed362b4215011e83e1b4fd36a9 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -378,10 +378,6 @@ struct dsa_switch_ops {
                                 struct switchdev_trans *trans);
        int     (*port_vlan_del)(struct dsa_switch *ds, int port,
                                 const struct switchdev_obj_port_vlan *vlan);
-       int     (*port_vlan_dump)(struct dsa_switch *ds, int port,
-                                 struct switchdev_obj_port_vlan *vlan,
-                                 switchdev_obj_dump_cb_t *cb);
-
        /*
         * Forwarding database
         */

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index 5d4e668b9471008968b134e99336a605b3e879b5..7f297bcefa0cae33be440f0b1ff54781a4883960 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -147,10 +147,6 @@ int dsa_port_vlan_add(struct dsa_port *dp,
                      struct switchdev_trans *trans);
 int dsa_port_vlan_del(struct dsa_port *dp,
                      const struct switchdev_obj_port_vlan *vlan);
-int dsa_port_vlan_dump(struct dsa_port *dp,
-                      struct switchdev_obj_port_vlan *vlan,
-                      switchdev_obj_dump_cb_t *cb);
-
 /* slave.c */
 extern const struct dsa_device_ops notag_netdev_ops;
 void dsa_slave_mii_bus_init(struct dsa_switch *ds);

diff --git a/net/dsa/port.c b/net/dsa/port.c
index 86e0585215bf1efde74566fcd41f3317191d9ad7..ce1921663cdd21908c3e360a2c888286471684d0 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -246,15 +246,3 @@ int dsa_port_vlan_del(struct dsa_port *dp,
 
        return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);
 }
-
-int dsa_port_vlan_dump(struct dsa_port *dp,
-                      struct switchdev_obj_port_vlan *vlan,
-                      switchdev_obj_dump_cb_t *cb)
-{
-       struct dsa_switch *ds = dp->ds;
-
-       if (ds->ops->port_vlan_dump)
-               return ds->ops->port_vlan_dump(ds, dp->index, vlan, cb);
-
-       return -EOPNOTSUPP;
-}

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index e9c1d8c5de0fb28936722202a3ca1e20ed285293..ccf670679343cb1f06844643dd3ee2612d2dd795 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -302,9 +302,6 @@ static int dsa_slave_port_obj_dump(struct net_device *dev,
        case SWITCHDEV_OBJ_ID_PORT_MDB:
                err = dsa_port_mdb_dump(dp, SWITCHDEV_OBJ_PORT_MDB(obj), cb);
                break;
-       case SWITCHDEV_OBJ_ID_PORT_VLAN:
-               err = dsa_port_vlan_dump(dp, SWITCHDEV_OBJ_PORT_VLAN(obj), cb);
-               break;
        default:
                err = -EOPNOTSUPP;
                break;
@@ -988,9 +985,6 @@ static const struct net_device_ops dsa_slave_netdev_ops = {
        .ndo_netpoll_cleanup    = dsa_slave_netpoll_cleanup,
        .ndo_poll_controller    = dsa_slave_poll_controller,
 #endif
-       .ndo_bridge_getlink     = switchdev_port_bridge_getlink,
-       .ndo_bridge_setlink     = switchdev_port_bridge_setlink,
-       .ndo_bridge_dellink     = switchdev_port_bridge_dellink,
        .ndo_get_phys_port_name = dsa_slave_get_phys_port_name,
        .ndo_setup_tc           = dsa_slave_setup_tc,
        .ndo_get_stats64        = dsa_slave_get_stats64,