mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
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: Jiri Pirko <jiri@resnulli.us> Signed-off-by: Scott Feldman <sfeldma@gmail.com> Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com> Acked-by: Andy Gospodarek <gospo@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a3eb95f891
commit
ebb9a03a59
11 changed files with 166 additions and 171 deletions
|
@ -43,124 +43,125 @@ struct swdev_ops {
|
|||
u8 tos, u8 type, u32 tb_id);
|
||||
};
|
||||
|
||||
enum netdev_switch_notifier_type {
|
||||
NETDEV_SWITCH_FDB_ADD = 1,
|
||||
NETDEV_SWITCH_FDB_DEL,
|
||||
enum switchdev_notifier_type {
|
||||
SWITCHDEV_FDB_ADD = 1,
|
||||
SWITCHDEV_FDB_DEL,
|
||||
};
|
||||
|
||||
struct netdev_switch_notifier_info {
|
||||
struct switchdev_notifier_info {
|
||||
struct net_device *dev;
|
||||
};
|
||||
|
||||
struct netdev_switch_notifier_fdb_info {
|
||||
struct netdev_switch_notifier_info info; /* must be first */
|
||||
struct switchdev_notifier_fdb_info {
|
||||
struct switchdev_notifier_info info; /* must be first */
|
||||
const unsigned char *addr;
|
||||
u16 vid;
|
||||
};
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NET_SWITCHDEV
|
||||
|
||||
int netdev_switch_parent_id_get(struct net_device *dev,
|
||||
struct netdev_phys_item_id *psid);
|
||||
int netdev_switch_port_stp_update(struct net_device *dev, u8 state);
|
||||
int register_netdev_switch_notifier(struct notifier_block *nb);
|
||||
int unregister_netdev_switch_notifier(struct notifier_block *nb);
|
||||
int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev,
|
||||
struct netdev_switch_notifier_info *info);
|
||||
int netdev_switch_port_bridge_setlink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh, u16 flags);
|
||||
int netdev_switch_port_bridge_dellink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh, u16 flags);
|
||||
int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh, u16 flags);
|
||||
int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh, u16 flags);
|
||||
int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
|
||||
u8 tos, u8 type, u32 nlflags, u32 tb_id);
|
||||
int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
|
||||
u8 tos, u8 type, u32 tb_id);
|
||||
void netdev_switch_fib_ipv4_abort(struct fib_info *fi);
|
||||
int switchdev_parent_id_get(struct net_device *dev,
|
||||
struct netdev_phys_item_id *psid);
|
||||
int switchdev_port_stp_update(struct net_device *dev, u8 state);
|
||||
int register_switchdev_notifier(struct notifier_block *nb);
|
||||
int unregister_switchdev_notifier(struct notifier_block *nb);
|
||||
int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
|
||||
struct switchdev_notifier_info *info);
|
||||
int switchdev_port_bridge_setlink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh, u16 flags);
|
||||
int switchdev_port_bridge_dellink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh, u16 flags);
|
||||
int ndo_dflt_switchdev_port_bridge_dellink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh, u16 flags);
|
||||
int ndo_dflt_switchdev_port_bridge_setlink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh, u16 flags);
|
||||
int switchdev_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
|
||||
u8 tos, u8 type, u32 nlflags, u32 tb_id);
|
||||
int switchdev_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
|
||||
u8 tos, u8 type, u32 tb_id);
|
||||
void switchdev_fib_ipv4_abort(struct fib_info *fi);
|
||||
|
||||
#else
|
||||
|
||||
static inline int netdev_switch_parent_id_get(struct net_device *dev,
|
||||
struct netdev_phys_item_id *psid)
|
||||
static inline int switchdev_parent_id_get(struct net_device *dev,
|
||||
struct netdev_phys_item_id *psid)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static inline int netdev_switch_port_stp_update(struct net_device *dev,
|
||||
u8 state)
|
||||
static inline int switchdev_port_stp_update(struct net_device *dev,
|
||||
u8 state)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
static inline int unregister_netdev_switch_notifier(struct notifier_block *nb)
|
||||
static inline int unregister_switchdev_notifier(struct notifier_block *nb)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev,
|
||||
struct netdev_switch_notifier_info *info)
|
||||
static inline int call_switchdev_notifiers(unsigned long val,
|
||||
struct net_device *dev,
|
||||
struct switchdev_notifier_info *info)
|
||||
{
|
||||
return NOTIFY_DONE;
|
||||
}
|
||||
|
||||
static inline int netdev_switch_port_bridge_setlink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh,
|
||||
u16 flags)
|
||||
static inline int switchdev_port_bridge_setlink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh,
|
||||
u16 flags)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static inline int netdev_switch_port_bridge_dellink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh,
|
||||
u16 flags)
|
||||
static inline int switchdev_port_bridge_dellink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh,
|
||||
u16 flags)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static inline int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh,
|
||||
u16 flags)
|
||||
static inline int ndo_dflt_switchdev_port_bridge_dellink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh,
|
||||
u16 flags)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh,
|
||||
u16 flags)
|
||||
static inline int ndo_dflt_switchdev_port_bridge_setlink(struct net_device *dev,
|
||||
struct nlmsghdr *nlh,
|
||||
u16 flags)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int netdev_switch_fib_ipv4_add(u32 dst, int dst_len,
|
||||
struct fib_info *fi,
|
||||
u8 tos, u8 type,
|
||||
u32 nlflags, u32 tb_id)
|
||||
static inline int switchdev_fib_ipv4_add(u32 dst, int dst_len,
|
||||
struct fib_info *fi,
|
||||
u8 tos, u8 type,
|
||||
u32 nlflags, u32 tb_id)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int netdev_switch_fib_ipv4_del(u32 dst, int dst_len,
|
||||
struct fib_info *fi,
|
||||
u8 tos, u8 type, u32 tb_id)
|
||||
static inline int switchdev_fib_ipv4_del(u32 dst, int dst_len,
|
||||
struct fib_info *fi,
|
||||
u8 tos, u8 type, u32 tb_id)
|
||||
{
|
||||
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)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue