net: dsa: change FDB routines prototypes
Change the prototype of port_getnext to include a vid parameter. This is necessary to introduce the support for VLAN. Also rename the fdb_{add,del,getnext} function pointers to port_fdb_{add,del,getnext} since they are specific to a given port. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c5723ac51f
commit
2a778e1b58
|
@ -116,9 +116,9 @@ struct dsa_switch_driver mv88e6171_switch_driver = {
|
||||||
.port_join_bridge = mv88e6xxx_join_bridge,
|
.port_join_bridge = mv88e6xxx_join_bridge,
|
||||||
.port_leave_bridge = mv88e6xxx_leave_bridge,
|
.port_leave_bridge = mv88e6xxx_leave_bridge,
|
||||||
.port_stp_update = mv88e6xxx_port_stp_update,
|
.port_stp_update = mv88e6xxx_port_stp_update,
|
||||||
.fdb_add = mv88e6xxx_port_fdb_add,
|
.port_fdb_add = mv88e6xxx_port_fdb_add,
|
||||||
.fdb_del = mv88e6xxx_port_fdb_del,
|
.port_fdb_del = mv88e6xxx_port_fdb_del,
|
||||||
.fdb_getnext = mv88e6xxx_port_fdb_getnext,
|
.port_fdb_getnext = mv88e6xxx_port_fdb_getnext,
|
||||||
};
|
};
|
||||||
|
|
||||||
MODULE_ALIAS("platform:mv88e6171");
|
MODULE_ALIAS("platform:mv88e6171");
|
||||||
|
|
|
@ -343,9 +343,9 @@ struct dsa_switch_driver mv88e6352_switch_driver = {
|
||||||
.port_join_bridge = mv88e6xxx_join_bridge,
|
.port_join_bridge = mv88e6xxx_join_bridge,
|
||||||
.port_leave_bridge = mv88e6xxx_leave_bridge,
|
.port_leave_bridge = mv88e6xxx_leave_bridge,
|
||||||
.port_stp_update = mv88e6xxx_port_stp_update,
|
.port_stp_update = mv88e6xxx_port_stp_update,
|
||||||
.fdb_add = mv88e6xxx_port_fdb_add,
|
.port_fdb_add = mv88e6xxx_port_fdb_add,
|
||||||
.fdb_del = mv88e6xxx_port_fdb_del,
|
.port_fdb_del = mv88e6xxx_port_fdb_del,
|
||||||
.fdb_getnext = mv88e6xxx_port_fdb_getnext,
|
.port_fdb_getnext = mv88e6xxx_port_fdb_getnext,
|
||||||
};
|
};
|
||||||
|
|
||||||
MODULE_ALIAS("platform:mv88e6172");
|
MODULE_ALIAS("platform:mv88e6172");
|
||||||
|
|
|
@ -1310,7 +1310,7 @@ static int __mv88e6xxx_port_getnext(struct dsa_switch *ds, int port,
|
||||||
|
|
||||||
/* get next entry for port */
|
/* get next entry for port */
|
||||||
int mv88e6xxx_port_fdb_getnext(struct dsa_switch *ds, int port,
|
int mv88e6xxx_port_fdb_getnext(struct dsa_switch *ds, int port,
|
||||||
unsigned char *addr, bool *is_static)
|
unsigned char *addr, u16 *vid, bool *is_static)
|
||||||
{
|
{
|
||||||
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
|
struct mv88e6xxx_priv_state *ps = ds_to_priv(ds);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
|
@ -421,7 +421,7 @@ int mv88e6xxx_port_fdb_add(struct dsa_switch *ds, int port,
|
||||||
int mv88e6xxx_port_fdb_del(struct dsa_switch *ds, int port,
|
int mv88e6xxx_port_fdb_del(struct dsa_switch *ds, int port,
|
||||||
const unsigned char *addr, u16 vid);
|
const unsigned char *addr, u16 vid);
|
||||||
int mv88e6xxx_port_fdb_getnext(struct dsa_switch *ds, int port,
|
int mv88e6xxx_port_fdb_getnext(struct dsa_switch *ds, int port,
|
||||||
unsigned char *addr, bool *is_static);
|
unsigned char *addr, u16 *vid, bool *is_static);
|
||||||
int mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page, int reg);
|
int mv88e6xxx_phy_page_read(struct dsa_switch *ds, int port, int page, int reg);
|
||||||
int mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page,
|
int mv88e6xxx_phy_page_write(struct dsa_switch *ds, int port, int page,
|
||||||
int reg, int val);
|
int reg, int val);
|
||||||
|
|
|
@ -296,12 +296,17 @@ struct dsa_switch_driver {
|
||||||
u32 br_port_mask);
|
u32 br_port_mask);
|
||||||
int (*port_stp_update)(struct dsa_switch *ds, int port,
|
int (*port_stp_update)(struct dsa_switch *ds, int port,
|
||||||
u8 state);
|
u8 state);
|
||||||
int (*fdb_add)(struct dsa_switch *ds, int port,
|
|
||||||
const unsigned char *addr, u16 vid);
|
/*
|
||||||
int (*fdb_del)(struct dsa_switch *ds, int port,
|
* Forwarding database
|
||||||
const unsigned char *addr, u16 vid);
|
*/
|
||||||
int (*fdb_getnext)(struct dsa_switch *ds, int port,
|
int (*port_fdb_add)(struct dsa_switch *ds, int port,
|
||||||
unsigned char *addr, bool *is_static);
|
const unsigned char *addr, u16 vid);
|
||||||
|
int (*port_fdb_del)(struct dsa_switch *ds, int port,
|
||||||
|
const unsigned char *addr, u16 vid);
|
||||||
|
int (*port_fdb_getnext)(struct dsa_switch *ds, int port,
|
||||||
|
unsigned char *addr, u16 *vid,
|
||||||
|
bool *is_static);
|
||||||
};
|
};
|
||||||
|
|
||||||
void register_switch_driver(struct dsa_switch_driver *type);
|
void register_switch_driver(struct dsa_switch_driver *type);
|
||||||
|
|
|
@ -208,8 +208,8 @@ static int dsa_slave_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
struct dsa_switch *ds = p->parent;
|
struct dsa_switch *ds = p->parent;
|
||||||
int ret = -EOPNOTSUPP;
|
int ret = -EOPNOTSUPP;
|
||||||
|
|
||||||
if (ds->drv->fdb_add)
|
if (ds->drv->port_fdb_add)
|
||||||
ret = ds->drv->fdb_add(ds, p->port, addr, vid);
|
ret = ds->drv->port_fdb_add(ds, p->port, addr, vid);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -222,8 +222,8 @@ static int dsa_slave_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
struct dsa_switch *ds = p->parent;
|
struct dsa_switch *ds = p->parent;
|
||||||
int ret = -EOPNOTSUPP;
|
int ret = -EOPNOTSUPP;
|
||||||
|
|
||||||
if (ds->drv->fdb_del)
|
if (ds->drv->port_fdb_del)
|
||||||
ret = ds->drv->fdb_del(ds, p->port, addr, vid);
|
ret = ds->drv->port_fdb_del(ds, p->port, addr, vid);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -272,22 +272,24 @@ static int dsa_slave_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb,
|
||||||
struct dsa_slave_priv *p = netdev_priv(dev);
|
struct dsa_slave_priv *p = netdev_priv(dev);
|
||||||
struct dsa_switch *ds = p->parent;
|
struct dsa_switch *ds = p->parent;
|
||||||
unsigned char addr[ETH_ALEN] = { 0 };
|
unsigned char addr[ETH_ALEN] = { 0 };
|
||||||
|
u16 vid = 0;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!ds->drv->fdb_getnext)
|
if (!ds->drv->port_fdb_getnext)
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
for (; ; idx++) {
|
for (; ; idx++) {
|
||||||
bool is_static;
|
bool is_static;
|
||||||
|
|
||||||
ret = ds->drv->fdb_getnext(ds, p->port, addr, &is_static);
|
ret = ds->drv->port_fdb_getnext(ds, p->port, addr, &vid,
|
||||||
|
&is_static);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if (idx < cb->args[0])
|
if (idx < cb->args[0])
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
ret = dsa_slave_fill_info(dev, skb, addr, 0,
|
ret = dsa_slave_fill_info(dev, skb, addr, vid,
|
||||||
is_static,
|
is_static,
|
||||||
NETLINK_CB(cb->skb).portid,
|
NETLINK_CB(cb->skb).portid,
|
||||||
cb->nlh->nlmsg_seq,
|
cb->nlh->nlmsg_seq,
|
||||||
|
|
Loading…
Reference in New Issue