Commit ebb9a03a authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller

switchdev: s/netdev_switch_/switchdev_/ and s/NETDEV_SWITCH_/SWITCHDEV_/

Turned out that "switchdev" sticks. So just unify all related terms to use
this prefix.
Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Acked-by: default avatarRoopa Prabhu <roopa@cumulusnetworks.com>
Acked-by: default avatarAndy Gospodarek <gospo@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a3eb95f8
...@@ -4039,8 +4039,8 @@ static const struct net_device_ops bond_netdev_ops = { ...@@ -4039,8 +4039,8 @@ static const struct net_device_ops bond_netdev_ops = {
.ndo_add_slave = bond_enslave, .ndo_add_slave = bond_enslave,
.ndo_del_slave = bond_release, .ndo_del_slave = bond_release,
.ndo_fix_features = bond_fix_features, .ndo_fix_features = bond_fix_features,
.ndo_bridge_setlink = ndo_dflt_netdev_switch_port_bridge_setlink, .ndo_bridge_setlink = ndo_dflt_switchdev_port_bridge_setlink,
.ndo_bridge_dellink = ndo_dflt_netdev_switch_port_bridge_dellink, .ndo_bridge_dellink = ndo_dflt_switchdev_port_bridge_dellink,
.ndo_features_check = passthru_features_check, .ndo_features_check = passthru_features_check,
}; };
......
...@@ -3377,17 +3377,17 @@ static void rocker_port_fdb_learn_work(struct work_struct *work) ...@@ -3377,17 +3377,17 @@ static void rocker_port_fdb_learn_work(struct work_struct *work)
container_of(work, struct rocker_fdb_learn_work, work); container_of(work, struct rocker_fdb_learn_work, work);
bool removing = (lw->flags & ROCKER_OP_FLAG_REMOVE); bool removing = (lw->flags & ROCKER_OP_FLAG_REMOVE);
bool learned = (lw->flags & ROCKER_OP_FLAG_LEARNED); bool learned = (lw->flags & ROCKER_OP_FLAG_LEARNED);
struct netdev_switch_notifier_fdb_info info; struct switchdev_notifier_fdb_info info;
info.addr = lw->addr; info.addr = lw->addr;
info.vid = lw->vid; info.vid = lw->vid;
if (learned && removing) if (learned && removing)
call_netdev_switch_notifiers(NETDEV_SWITCH_FDB_DEL, call_switchdev_notifiers(SWITCHDEV_FDB_DEL,
lw->dev, &info.info); lw->dev, &info.info);
else if (learned && !removing) else if (learned && !removing)
call_netdev_switch_notifiers(NETDEV_SWITCH_FDB_ADD, call_switchdev_notifiers(SWITCHDEV_FDB_ADD,
lw->dev, &info.info); lw->dev, &info.info);
kfree(work); kfree(work);
} }
......
...@@ -1977,8 +1977,8 @@ static const struct net_device_ops team_netdev_ops = { ...@@ -1977,8 +1977,8 @@ static const struct net_device_ops team_netdev_ops = {
.ndo_del_slave = team_del_slave, .ndo_del_slave = team_del_slave,
.ndo_fix_features = team_fix_features, .ndo_fix_features = team_fix_features,
.ndo_change_carrier = team_change_carrier, .ndo_change_carrier = team_change_carrier,
.ndo_bridge_setlink = ndo_dflt_netdev_switch_port_bridge_setlink, .ndo_bridge_setlink = ndo_dflt_switchdev_port_bridge_setlink,
.ndo_bridge_dellink = ndo_dflt_netdev_switch_port_bridge_dellink, .ndo_bridge_dellink = ndo_dflt_switchdev_port_bridge_dellink,
.ndo_features_check = passthru_features_check, .ndo_features_check = passthru_features_check,
}; };
......
...@@ -43,124 +43,125 @@ struct swdev_ops { ...@@ -43,124 +43,125 @@ struct swdev_ops {
u8 tos, u8 type, u32 tb_id); u8 tos, u8 type, u32 tb_id);
}; };
enum netdev_switch_notifier_type { enum switchdev_notifier_type {
NETDEV_SWITCH_FDB_ADD = 1, SWITCHDEV_FDB_ADD = 1,
NETDEV_SWITCH_FDB_DEL, SWITCHDEV_FDB_DEL,
}; };
struct netdev_switch_notifier_info { struct switchdev_notifier_info {
struct net_device *dev; struct net_device *dev;
}; };
struct netdev_switch_notifier_fdb_info { struct switchdev_notifier_fdb_info {
struct netdev_switch_notifier_info info; /* must be first */ struct switchdev_notifier_info info; /* must be first */
const unsigned char *addr; const unsigned char *addr;
u16 vid; u16 vid;
}; };
static inline struct net_device * static inline struct net_device *
netdev_switch_notifier_info_to_dev(const struct netdev_switch_notifier_info *info) switchdev_notifier_info_to_dev(const struct switchdev_notifier_info *info)
{ {
return info->dev; return info->dev;
} }
#ifdef CONFIG_NET_SWITCHDEV #ifdef CONFIG_NET_SWITCHDEV
int netdev_switch_parent_id_get(struct net_device *dev, int switchdev_parent_id_get(struct net_device *dev,
struct netdev_phys_item_id *psid); struct netdev_phys_item_id *psid);
int netdev_switch_port_stp_update(struct net_device *dev, u8 state); int switchdev_port_stp_update(struct net_device *dev, u8 state);
int register_netdev_switch_notifier(struct notifier_block *nb); int register_switchdev_notifier(struct notifier_block *nb);
int unregister_netdev_switch_notifier(struct notifier_block *nb); int unregister_switchdev_notifier(struct notifier_block *nb);
int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev, int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
struct netdev_switch_notifier_info *info); struct switchdev_notifier_info *info);
int netdev_switch_port_bridge_setlink(struct net_device *dev, int switchdev_port_bridge_setlink(struct net_device *dev,
struct nlmsghdr *nlh, u16 flags); struct nlmsghdr *nlh, u16 flags);
int netdev_switch_port_bridge_dellink(struct net_device *dev, int switchdev_port_bridge_dellink(struct net_device *dev,
struct nlmsghdr *nlh, u16 flags); struct nlmsghdr *nlh, u16 flags);
int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev, int ndo_dflt_switchdev_port_bridge_dellink(struct net_device *dev,
struct nlmsghdr *nlh, u16 flags); struct nlmsghdr *nlh, u16 flags);
int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *dev, int ndo_dflt_switchdev_port_bridge_setlink(struct net_device *dev,
struct nlmsghdr *nlh, u16 flags); struct nlmsghdr *nlh, u16 flags);
int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi, int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
u8 tos, u8 type, u32 nlflags, u32 tb_id); u8 tos, u8 type, u32 nlflags, u32 tb_id);
int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi, int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
u8 tos, u8 type, u32 tb_id); u8 tos, u8 type, u32 tb_id);
void netdev_switch_fib_ipv4_abort(struct fib_info *fi); void switchdev_fib_ipv4_abort(struct fib_info *fi);
#else #else
static inline int netdev_switch_parent_id_get(struct net_device *dev, static inline int switchdev_parent_id_get(struct net_device *dev,
struct netdev_phys_item_id *psid) struct netdev_phys_item_id *psid)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
static inline int netdev_switch_port_stp_update(struct net_device *dev, static inline int switchdev_port_stp_update(struct net_device *dev,
u8 state) u8 state)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
static inline int register_netdev_switch_notifier(struct notifier_block *nb) static inline int register_switchdev_notifier(struct notifier_block *nb)
{ {
return 0; return 0;
} }
static inline int unregister_netdev_switch_notifier(struct notifier_block *nb) static inline int unregister_switchdev_notifier(struct notifier_block *nb)
{ {
return 0; return 0;
} }
static inline int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev, static inline int call_switchdev_notifiers(unsigned long val,
struct netdev_switch_notifier_info *info) struct net_device *dev,
struct switchdev_notifier_info *info)
{ {
return NOTIFY_DONE; return NOTIFY_DONE;
} }
static inline int netdev_switch_port_bridge_setlink(struct net_device *dev, static inline int switchdev_port_bridge_setlink(struct net_device *dev,
struct nlmsghdr *nlh, struct nlmsghdr *nlh,
u16 flags) u16 flags)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
static inline int netdev_switch_port_bridge_dellink(struct net_device *dev, static inline int switchdev_port_bridge_dellink(struct net_device *dev,
struct nlmsghdr *nlh, struct nlmsghdr *nlh,
u16 flags) u16 flags)
{ {
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
static inline int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev, static inline int ndo_dflt_switchdev_port_bridge_dellink(struct net_device *dev,
struct nlmsghdr *nlh, struct nlmsghdr *nlh,
u16 flags) u16 flags)
{ {
return 0; return 0;
} }
static inline int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *dev, static inline int ndo_dflt_switchdev_port_bridge_setlink(struct net_device *dev,
struct nlmsghdr *nlh, struct nlmsghdr *nlh,
u16 flags) u16 flags)
{ {
return 0; return 0;
} }
static inline int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, static inline int switchdev_fib_ipv4_add(u32 dst, int dst_len,
struct fib_info *fi, struct fib_info *fi,
u8 tos, u8 type, u8 tos, u8 type,
u32 nlflags, u32 tb_id) u32 nlflags, u32 tb_id)
{ {
return 0; return 0;
} }
static inline int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, static inline int switchdev_fib_ipv4_del(u32 dst, int dst_len,
struct fib_info *fi, struct fib_info *fi,
u8 tos, u8 type, u32 tb_id) u8 tos, u8 type, u32 tb_id)
{ {
return 0; return 0;
} }
static inline void netdev_switch_fib_ipv4_abort(struct fib_info *fi) static inline void switchdev_fib_ipv4_abort(struct fib_info *fi)
{ {
} }
......
...@@ -121,13 +121,13 @@ static struct notifier_block br_device_notifier = { ...@@ -121,13 +121,13 @@ static struct notifier_block br_device_notifier = {
.notifier_call = br_device_event .notifier_call = br_device_event
}; };
static int br_netdev_switch_event(struct notifier_block *unused, static int br_switchdev_event(struct notifier_block *unused,
unsigned long event, void *ptr) unsigned long event, void *ptr)
{ {
struct net_device *dev = netdev_switch_notifier_info_to_dev(ptr); struct net_device *dev = switchdev_notifier_info_to_dev(ptr);
struct net_bridge_port *p; struct net_bridge_port *p;
struct net_bridge *br; struct net_bridge *br;
struct netdev_switch_notifier_fdb_info *fdb_info; struct switchdev_notifier_fdb_info *fdb_info;
int err = NOTIFY_DONE; int err = NOTIFY_DONE;
rtnl_lock(); rtnl_lock();
...@@ -138,14 +138,14 @@ static int br_netdev_switch_event(struct notifier_block *unused, ...@@ -138,14 +138,14 @@ static int br_netdev_switch_event(struct notifier_block *unused,
br = p->br; br = p->br;
switch (event) { switch (event) {
case NETDEV_SWITCH_FDB_ADD: case SWITCHDEV_FDB_ADD:
fdb_info = ptr; fdb_info = ptr;
err = br_fdb_external_learn_add(br, p, fdb_info->addr, err = br_fdb_external_learn_add(br, p, fdb_info->addr,
fdb_info->vid); fdb_info->vid);
if (err) if (err)
err = notifier_from_errno(err); err = notifier_from_errno(err);
break; break;
case NETDEV_SWITCH_FDB_DEL: case SWITCHDEV_FDB_DEL:
fdb_info = ptr; fdb_info = ptr;
err = br_fdb_external_learn_del(br, p, fdb_info->addr, err = br_fdb_external_learn_del(br, p, fdb_info->addr,
fdb_info->vid); fdb_info->vid);
...@@ -159,8 +159,8 @@ static int br_netdev_switch_event(struct notifier_block *unused, ...@@ -159,8 +159,8 @@ static int br_netdev_switch_event(struct notifier_block *unused,
return err; return err;
} }
static struct notifier_block br_netdev_switch_notifier = { static struct notifier_block br_switchdev_notifier = {
.notifier_call = br_netdev_switch_event, .notifier_call = br_switchdev_event,
}; };
static void __net_exit br_net_exit(struct net *net) static void __net_exit br_net_exit(struct net *net)
...@@ -214,7 +214,7 @@ static int __init br_init(void) ...@@ -214,7 +214,7 @@ static int __init br_init(void)
if (err) if (err)
goto err_out3; goto err_out3;
err = register_netdev_switch_notifier(&br_netdev_switch_notifier); err = register_switchdev_notifier(&br_switchdev_notifier);
if (err) if (err)
goto err_out4; goto err_out4;
...@@ -235,7 +235,7 @@ static int __init br_init(void) ...@@ -235,7 +235,7 @@ static int __init br_init(void)
return 0; return 0;
err_out5: err_out5:
unregister_netdev_switch_notifier(&br_netdev_switch_notifier); unregister_switchdev_notifier(&br_switchdev_notifier);
err_out4: err_out4:
unregister_netdevice_notifier(&br_device_notifier); unregister_netdevice_notifier(&br_device_notifier);
err_out3: err_out3:
...@@ -253,7 +253,7 @@ static void __exit br_deinit(void) ...@@ -253,7 +253,7 @@ static void __exit br_deinit(void)
{ {
stp_proto_unregister(&br_stp_proto); stp_proto_unregister(&br_stp_proto);
br_netlink_fini(); br_netlink_fini();
unregister_netdev_switch_notifier(&br_netdev_switch_notifier); unregister_switchdev_notifier(&br_switchdev_notifier);
unregister_netdevice_notifier(&br_device_notifier); unregister_netdevice_notifier(&br_device_notifier);
brioctl_set(NULL); brioctl_set(NULL);
unregister_pernet_subsys(&br_net_ops); unregister_pernet_subsys(&br_net_ops);
......
...@@ -631,8 +631,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags) ...@@ -631,8 +631,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
if (p && !(flags & BRIDGE_FLAGS_SELF)) { if (p && !(flags & BRIDGE_FLAGS_SELF)) {
/* set bridge attributes in hardware if supported /* set bridge attributes in hardware if supported
*/ */
ret_offload = netdev_switch_port_bridge_setlink(dev, nlh, ret_offload = switchdev_port_bridge_setlink(dev, nlh, flags);
flags);
if (ret_offload && ret_offload != -EOPNOTSUPP) if (ret_offload && ret_offload != -EOPNOTSUPP)
br_warn(p->br, "error setting attrs on port %u(%s)\n", br_warn(p->br, "error setting attrs on port %u(%s)\n",
(unsigned int)p->port_no, p->dev->name); (unsigned int)p->port_no, p->dev->name);
...@@ -671,8 +670,7 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags) ...@@ -671,8 +670,7 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
if (p && !(flags & BRIDGE_FLAGS_SELF)) { if (p && !(flags & BRIDGE_FLAGS_SELF)) {
/* del bridge attributes in hardware /* del bridge attributes in hardware
*/ */
ret_offload = netdev_switch_port_bridge_dellink(dev, nlh, ret_offload = switchdev_port_bridge_dellink(dev, nlh, flags);
flags);
if (ret_offload && ret_offload != -EOPNOTSUPP) if (ret_offload && ret_offload != -EOPNOTSUPP)
br_warn(p->br, "error deleting attrs on port %u (%s)\n", br_warn(p->br, "error deleting attrs on port %u (%s)\n",
(unsigned int)p->port_no, p->dev->name); (unsigned int)p->port_no, p->dev->name);
......
...@@ -42,7 +42,7 @@ void br_set_state(struct net_bridge_port *p, unsigned int state) ...@@ -42,7 +42,7 @@ void br_set_state(struct net_bridge_port *p, unsigned int state)
int err; int err;
p->state = state; p->state = state;
err = netdev_switch_port_stp_update(p->dev, state); err = switchdev_port_stp_update(p->dev, state);
if (err && err != -EOPNOTSUPP) if (err && err != -EOPNOTSUPP)
br_warn(p->br, "error setting offload STP state on port %u(%s)\n", br_warn(p->br, "error setting offload STP state on port %u(%s)\n",
(unsigned int) p->port_no, p->dev->name); (unsigned int) p->port_no, p->dev->name);
......
...@@ -460,7 +460,7 @@ static ssize_t phys_switch_id_show(struct device *dev, ...@@ -460,7 +460,7 @@ static ssize_t phys_switch_id_show(struct device *dev,
if (dev_isalive(netdev)) { if (dev_isalive(netdev)) {
struct netdev_phys_item_id ppid; struct netdev_phys_item_id ppid;
ret = netdev_switch_parent_id_get(netdev, &ppid); ret = switchdev_parent_id_get(netdev, &ppid);
if (!ret) if (!ret)
ret = sprintf(buf, "%*phN\n", ppid.id_len, ppid.id); ret = sprintf(buf, "%*phN\n", ppid.id_len, ppid.id);
} }
......
...@@ -1006,7 +1006,7 @@ static int rtnl_phys_switch_id_fill(struct sk_buff *skb, struct net_device *dev) ...@@ -1006,7 +1006,7 @@ static int rtnl_phys_switch_id_fill(struct sk_buff *skb, struct net_device *dev)
int err; int err;
struct netdev_phys_item_id psid; struct netdev_phys_item_id psid;
err = netdev_switch_parent_id_get(dev, &psid); err = switchdev_parent_id_get(dev, &psid);
if (err) { if (err) {
if (err == -EOPNOTSUPP) if (err == -EOPNOTSUPP)
return 0; return 0;
......
...@@ -1165,13 +1165,13 @@ int fib_table_insert(struct fib_table *tb, struct fib_config *cfg) ...@@ -1165,13 +1165,13 @@ int fib_table_insert(struct fib_table *tb, struct fib_config *cfg)
new_fa->fa_state = state & ~FA_S_ACCESSED; new_fa->fa_state = state & ~FA_S_ACCESSED;
new_fa->fa_slen = fa->fa_slen; new_fa->fa_slen = fa->fa_slen;
err = netdev_switch_fib_ipv4_add(key, plen, fi, err = switchdev_fib_ipv4_add(key, plen, fi,
new_fa->fa_tos, new_fa->fa_tos,
cfg->fc_type, cfg->fc_type,
cfg->fc_nlflags, cfg->fc_nlflags,
tb->tb_id); tb->tb_id);
if (err) { if (err) {
netdev_switch_fib_ipv4_abort(fi); switchdev_fib_ipv4_abort(fi);
kmem_cache_free(fn_alias_kmem, new_fa); kmem_cache_free(fn_alias_kmem, new_fa);
goto out; goto out;
} }
...@@ -1215,12 +1215,10 @@ int fib_table_insert(struct fib_table *tb, struct fib_config *cfg) ...@@ -1215,12 +1215,10 @@ int fib_table_insert(struct fib_table *tb, struct fib_config *cfg)
new_fa->tb_id = tb->tb_id; new_fa->tb_id = tb->tb_id;
/* (Optionally) offload fib entry to switch hardware. */ /* (Optionally) offload fib entry to switch hardware. */
err = netdev_switch_fib_ipv4_add(key, plen, fi, tos, err = switchdev_fib_ipv4_add(key, plen, fi, tos, cfg->fc_type,
cfg->fc_type, cfg->fc_nlflags, tb->tb_id);
cfg->fc_nlflags,
tb->tb_id);
if (err) { if (err) {
netdev_switch_fib_ipv4_abort(fi); switchdev_fib_ipv4_abort(fi);
goto out_free_new_fa; goto out_free_new_fa;
} }
...@@ -1239,7 +1237,7 @@ int fib_table_insert(struct fib_table *tb, struct fib_config *cfg) ...@@ -1239,7 +1237,7 @@ int fib_table_insert(struct fib_table *tb, struct fib_config *cfg)
return 0; return 0;
out_sw_fib_del: out_sw_fib_del:
netdev_switch_fib_ipv4_del(key, plen, fi, tos, cfg->fc_type, tb->tb_id); switchdev_fib_ipv4_del(key, plen, fi, tos, cfg->fc_type, tb->tb_id);
out_free_new_fa: out_free_new_fa:
kmem_cache_free(fn_alias_kmem, new_fa); kmem_cache_free(fn_alias_kmem, new_fa);
out: out:
...@@ -1517,8 +1515,8 @@ int fib_table_delete(struct fib_table *tb, struct fib_config *cfg) ...@@ -1517,8 +1515,8 @@ int fib_table_delete(struct fib_table *tb, struct fib_config *cfg)
if (!fa_to_delete) if (!fa_to_delete)
return -ESRCH; return -ESRCH;
netdev_switch_fib_ipv4_del(key, plen, fa_to_delete->fa_info, tos, switchdev_fib_ipv4_del(key, plen, fa_to_delete->fa_info, tos,
cfg->fc_type, tb->tb_id); cfg->fc_type, tb->tb_id);
rtmsg_fib(RTM_DELROUTE, htonl(key), fa_to_delete, plen, tb->tb_id, rtmsg_fib(RTM_DELROUTE, htonl(key), fa_to_delete, plen, tb->tb_id,
&cfg->fc_nlinfo, 0); &cfg->fc_nlinfo, 0);
...@@ -1767,10 +1765,9 @@ void fib_table_flush_external(struct fib_table *tb) ...@@ -1767,10 +1765,9 @@ void fib_table_flush_external(struct fib_table *tb)
if (!fi || !(fi->fib_flags & RTNH_F_EXTERNAL)) if (!fi || !(fi->fib_flags & RTNH_F_EXTERNAL))
continue; continue;
netdev_switch_fib_ipv4_del(n->key, switchdev_fib_ipv4_del(n->key, KEYLENGTH - fa->fa_slen,
KEYLENGTH - fa->fa_slen, fi, fa->fa_tos, fa->fa_type,
fi, fa->fa_tos, tb->tb_id);
fa->fa_type, tb->tb_id);
} }
/* update leaf slen */ /* update leaf slen */
...@@ -1835,10 +1832,9 @@ int fib_table_flush(struct fib_table *tb) ...@@ -1835,10 +1832,9 @@ int fib_table_flush(struct fib_table *tb)
continue; continue;
} }
netdev_switch_fib_ipv4_del(n->key, switchdev_fib_ipv4_del(n->key, KEYLENGTH - fa->fa_slen,
KEYLENGTH - fa->fa_slen, fi, fa->fa_tos, fa->fa_type,
fi, fa->fa_tos, tb->tb_id);
fa->fa_type, tb->tb_id);
hlist_del_rcu(&fa->fa_list); hlist_del_rcu(&fa->fa_list);
fib_release_info(fa->fa_info); fib_release_info(fa->fa_info);
alias_free_mem_rcu(fa); alias_free_mem_rcu(fa);
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment