net: dsa: move VLAN handlers
Move the DSA port code which handles VLAN objects in port.c, where it belongs. 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:
parent
3a9afea37e
commit
076e713365
|
@ -84,6 +84,14 @@ int dsa_port_mdb_del(struct dsa_port *dp,
|
||||||
const struct switchdev_obj_port_mdb *mdb);
|
const struct switchdev_obj_port_mdb *mdb);
|
||||||
int dsa_port_mdb_dump(struct dsa_port *dp, struct switchdev_obj_port_mdb *mdb,
|
int dsa_port_mdb_dump(struct dsa_port *dp, struct switchdev_obj_port_mdb *mdb,
|
||||||
switchdev_obj_dump_cb_t *cb);
|
switchdev_obj_dump_cb_t *cb);
|
||||||
|
int dsa_port_vlan_add(struct dsa_port *dp,
|
||||||
|
const struct switchdev_obj_port_vlan *vlan,
|
||||||
|
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 */
|
/* slave.c */
|
||||||
extern const struct dsa_device_ops notag_netdev_ops;
|
extern const struct dsa_device_ops notag_netdev_ops;
|
||||||
|
|
|
@ -247,3 +247,44 @@ int dsa_port_mdb_dump(struct dsa_port *dp, struct switchdev_obj_port_mdb *mdb,
|
||||||
|
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int dsa_port_vlan_add(struct dsa_port *dp,
|
||||||
|
const struct switchdev_obj_port_vlan *vlan,
|
||||||
|
struct switchdev_trans *trans)
|
||||||
|
{
|
||||||
|
struct dsa_switch *ds = dp->ds;
|
||||||
|
|
||||||
|
if (switchdev_trans_ph_prepare(trans)) {
|
||||||
|
if (!ds->ops->port_vlan_prepare || !ds->ops->port_vlan_add)
|
||||||
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
|
return ds->ops->port_vlan_prepare(ds, dp->index, vlan, trans);
|
||||||
|
}
|
||||||
|
|
||||||
|
ds->ops->port_vlan_add(ds, dp->index, vlan, trans);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int dsa_port_vlan_del(struct dsa_port *dp,
|
||||||
|
const struct switchdev_obj_port_vlan *vlan)
|
||||||
|
{
|
||||||
|
struct dsa_switch *ds = dp->ds;
|
||||||
|
|
||||||
|
if (!ds->ops->port_vlan_del)
|
||||||
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
|
return ds->ops->port_vlan_del(ds, dp->index, vlan);
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
|
@ -204,47 +204,6 @@ out:
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dsa_port_vlan_add(struct dsa_port *dp,
|
|
||||||
const struct switchdev_obj_port_vlan *vlan,
|
|
||||||
struct switchdev_trans *trans)
|
|
||||||
{
|
|
||||||
struct dsa_switch *ds = dp->ds;
|
|
||||||
|
|
||||||
if (switchdev_trans_ph_prepare(trans)) {
|
|
||||||
if (!ds->ops->port_vlan_prepare || !ds->ops->port_vlan_add)
|
|
||||||
return -EOPNOTSUPP;
|
|
||||||
|
|
||||||
return ds->ops->port_vlan_prepare(ds, dp->index, vlan, trans);
|
|
||||||
}
|
|
||||||
|
|
||||||
ds->ops->port_vlan_add(ds, dp->index, vlan, trans);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int dsa_port_vlan_del(struct dsa_port *dp,
|
|
||||||
const struct switchdev_obj_port_vlan *vlan)
|
|
||||||
{
|
|
||||||
struct dsa_switch *ds = dp->ds;
|
|
||||||
|
|
||||||
if (!ds->ops->port_vlan_del)
|
|
||||||
return -EOPNOTSUPP;
|
|
||||||
|
|
||||||
return ds->ops->port_vlan_del(ds, dp->index, vlan);
|
|
||||||
}
|
|
||||||
|
|
||||||
static 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int dsa_slave_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
static int dsa_slave_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
||||||
{
|
{
|
||||||
struct dsa_slave_priv *p = netdev_priv(dev);
|
struct dsa_slave_priv *p = netdev_priv(dev);
|
||||||
|
|
Loading…
Reference in a new issue