summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ethernet/rocker/rocker.c6
-rw-r--r--include/net/switchdev.h2
-rw-r--r--net/bridge/br_fdb.c2
-rw-r--r--net/dsa/slave.c6
-rw-r--r--net/switchdev/switchdev.c8
5 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index d75fc4b3baa9..875f9b5b78a2 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4425,7 +4425,7 @@ static int rocker_port_vlans_add(struct rocker_port *rocker_port,
static int rocker_port_fdb_add(struct rocker_port *rocker_port,
struct switchdev_trans *trans,
- const struct switchdev_obj_fdb *fdb)
+ const struct switchdev_obj_port_fdb *fdb)
{
__be16 vlan_id = rocker_port_vid_to_vlan(rocker_port, fdb->vid, NULL);
int flags = 0;
@@ -4496,7 +4496,7 @@ static int rocker_port_vlans_del(struct rocker_port *rocker_port,
static int rocker_port_fdb_del(struct rocker_port *rocker_port,
struct switchdev_trans *trans,
- const struct switchdev_obj_fdb *fdb)
+ const struct switchdev_obj_port_fdb *fdb)
{
__be16 vlan_id = rocker_port_vid_to_vlan(rocker_port, fdb->vid, NULL);
int flags = ROCKER_OP_FLAG_NOWAIT | ROCKER_OP_FLAG_REMOVE;
@@ -4537,7 +4537,7 @@ static int rocker_port_obj_del(struct net_device *dev,
}
static int rocker_port_fdb_dump(const struct rocker_port *rocker_port,
- struct switchdev_obj_fdb *fdb,
+ struct switchdev_obj_port_fdb *fdb,
int (*cb)(void *obj))
{
struct rocker *rocker = rocker_port->rocker;
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 0138f9b374e2..8d71fdbaa7a6 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -83,7 +83,7 @@ struct switchdev_obj_ipv4_fib {
};
/* SWITCHDEV_OBJ_ID_PORT_FDB */
-struct switchdev_obj_fdb {
+struct switchdev_obj_port_fdb {
const unsigned char *addr;
u16 vid;
u16 ndm_state;
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c
index 6fc8e71277d4..36aab5e4784c 100644
--- a/net/bridge/br_fdb.c
+++ b/net/bridge/br_fdb.c
@@ -133,7 +133,7 @@ static void fdb_del_hw_addr(struct net_bridge *br, const unsigned char *addr)
static void fdb_del_external_learn(struct net_bridge_fdb_entry *f)
{
- struct switchdev_obj_fdb fdb = {
+ struct switchdev_obj_port_fdb fdb = {
.addr = f->addr.addr,
.vid = f->vlan_id,
};
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index baf34f222115..6e8dc6a0102c 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -341,7 +341,7 @@ static int dsa_slave_port_vlan_dump(struct net_device *dev,
}
static int dsa_slave_port_fdb_add(struct net_device *dev,
- const struct switchdev_obj_fdb *fdb,
+ const struct switchdev_obj_port_fdb *fdb,
struct switchdev_trans *trans)
{
struct dsa_slave_priv *p = netdev_priv(dev);
@@ -357,7 +357,7 @@ static int dsa_slave_port_fdb_add(struct net_device *dev,
}
static int dsa_slave_port_fdb_del(struct net_device *dev,
- const struct switchdev_obj_fdb *fdb)
+ const struct switchdev_obj_port_fdb *fdb)
{
struct dsa_slave_priv *p = netdev_priv(dev);
struct dsa_switch *ds = p->parent;
@@ -370,7 +370,7 @@ static int dsa_slave_port_fdb_del(struct net_device *dev,
}
static int dsa_slave_port_fdb_dump(struct net_device *dev,
- struct switchdev_obj_fdb *fdb,
+ struct switchdev_obj_port_fdb *fdb,
int (*cb)(void *obj))
{
struct dsa_slave_priv *p = netdev_priv(dev);
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 02ee926ebde6..250d013d64c6 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -819,7 +819,7 @@ int switchdev_port_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
struct net_device *dev, const unsigned char *addr,
u16 vid, u16 nlm_flags)
{
- struct switchdev_obj_fdb fdb = {
+ struct switchdev_obj_port_fdb fdb = {
.addr = addr,
.vid = vid,
};
@@ -843,7 +843,7 @@ int switchdev_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
struct net_device *dev, const unsigned char *addr,
u16 vid)
{
- struct switchdev_obj_fdb fdb = {
+ struct switchdev_obj_port_fdb fdb = {
.addr = addr,
.vid = vid,
};
@@ -853,7 +853,7 @@ int switchdev_port_fdb_del(struct ndmsg *ndm, struct nlattr *tb[],
EXPORT_SYMBOL_GPL(switchdev_port_fdb_del);
struct switchdev_fdb_dump {
- struct switchdev_obj_fdb fdb;
+ struct switchdev_obj_port_fdb fdb;
struct net_device *dev;
struct sk_buff *skb;
struct netlink_callback *cb;
@@ -862,7 +862,7 @@ struct switchdev_fdb_dump {
static int switchdev_port_fdb_dump_cb(void *obj)
{
- struct switchdev_obj_fdb *fdb = obj;
+ struct switchdev_obj_port_fdb *fdb = obj;
struct switchdev_fdb_dump *dump =
container_of(fdb, struct switchdev_fdb_dump, fdb);
u32 portid = NETLINK_CB(dump->cb->skb).portid;