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

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

switchdev: add new switchdev_port_bridge_dellink 



Same change as setlink.  Provide the wrapper op for SELF ndo_bridge_dellink
and call into the switchdev driver to delete afspec VLANs.

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 41c498b9

include/net/switchdev.h

+6 −0
Original line number Diff line number Diff line
@@ -164,6 +164,12 @@ static inline int switchdev_port_obj_del(struct net_device *dev, 
	return -EOPNOTSUPP;

}



static inline int switchdev_port_bridge_dellink(struct net_device *dev,

					    struct nlmsghdr *nlh, u16 flags)

{

	return -EOPNOTSUPP;

}



static inline int register_switchdev_notifier(struct notifier_block *nb)

{

	return 0;

net/switchdev/switchdev.c

+12 −12
Original line number Diff line number Diff line
@@ -512,27 +512,27 @@ int switchdev_port_bridge_setlink(struct net_device *dev, 
EXPORT_SYMBOL_GPL(switchdev_port_bridge_setlink);



/**

 *	switchdev_port_bridge_dellink - Notify switch device port of bridge

 *	port attribute delete

 *	switchdev_port_bridge_dellink - Set bridge port attributes

 *

 *	@dev: port device

 *	@nlh: netlink msg with bridge port attributes

 *	@flags: bridge setlink flags

 *	@nlh: netlink header

 *	@flags: netlink flags

 *

 *	Notify switch device port of bridge port attribute delete

 *	Called for SELF on rtnl_bridge_dellink to set bridge port

 *	attributes.

 */

int switchdev_port_bridge_dellink(struct net_device *dev,

				  struct nlmsghdr *nlh, u16 flags)

{

	const struct net_device_ops *ops = dev->netdev_ops;



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

		return 0;

	struct nlattr *afspec;



	if (!ops->ndo_bridge_dellink)

		return -EOPNOTSUPP;

	afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg),

				 IFLA_AF_SPEC);

	if (afspec)

		return switchdev_port_br_afspec(dev, afspec,

						switchdev_port_obj_del);



	return ops->ndo_bridge_dellink(dev, nlh, flags);

	return 0;

}

EXPORT_SYMBOL_GPL(switchdev_port_bridge_dellink);