Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e71f220b authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

switchdev: remove old switchdev_port_bridge_setlink 



New attr-based bridge_setlink can recurse lower devs and recover on err, so
remove old wrapper (including ndo_dflt_switchdev_port_bridge_setlink).

Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc8f40d8

include/net/switchdev.h

+0 −9
Original line number Original line Diff line number Diff line
@@ -132,8 +132,6 @@ int switchdev_port_bridge_dellink(struct net_device *dev, 
				  struct nlmsghdr *nlh, u16 flags);

				  struct nlmsghdr *nlh, u16 flags);

int ndo_dflt_switchdev_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_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,

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 switchdev_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,
@@ -204,13 +202,6 @@ static inline int ndo_dflt_switchdev_port_bridge_dellink(struct net_device *dev, 
	return 0;

	return 0;

}

}





static inline int ndo_dflt_switchdev_port_bridge_setlink(struct net_device *dev,

							 struct nlmsghdr *nlh,

							 u16 flags)

{

	return 0;

}



static inline int switchdev_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,

net/switchdev/switchdev.c

+0 −30
Original line number Original line Diff line number Diff line
@@ -536,36 +536,6 @@ int switchdev_port_bridge_dellink(struct net_device *dev, 
}

}

EXPORT_SYMBOL_GPL(switchdev_port_bridge_dellink);

EXPORT_SYMBOL_GPL(switchdev_port_bridge_dellink);





/**

 *	ndo_dflt_switchdev_port_bridge_setlink - default ndo bridge setlink

 *						 op for master devices

 *

 *	@dev: port device

 *	@nlh: netlink msg with bridge port attributes

 *	@flags: bridge setlink flags

 *

 *	Notify master device slaves of bridge port attributes

 */

int ndo_dflt_switchdev_port_bridge_setlink(struct net_device *dev,

					   struct nlmsghdr *nlh, u16 flags)

{

	struct net_device *lower_dev;

	struct list_head *iter;

	int ret = 0, err = 0;



	if (!(dev->features & NETIF_F_HW_SWITCH_OFFLOAD))

		return ret;



	netdev_for_each_lower_dev(dev, lower_dev, iter) {

		err = switchdev_port_bridge_setlink(lower_dev, nlh, flags);

		if (err && err != -EOPNOTSUPP)

			ret = err;

	}



	return ret;

}

EXPORT_SYMBOL_GPL(ndo_dflt_switchdev_port_bridge_setlink);



/**

/**

 *	ndo_dflt_switchdev_port_bridge_dellink - default ndo bridge dellink

 *	ndo_dflt_switchdev_port_bridge_dellink - default ndo bridge dellink

 *						 op for master devices

 *						 op for master devices