UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Scott Feldman 2015-05-10 09:48:00 -07:00 committed by David S. Miller
parent 41c498b935
commit 5c34e02214
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/switchdev.h
View File

@ -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;

24
net/switchdev/switchdev.c
View File

@ -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;
struct nlattr *afspec;
if (!(dev->features & NETIF_F_HW_SWITCH_OFFLOAD))
return 0;
afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg),
IFLA_AF_SPEC);
if (afspec)
return switchdev_port_br_afspec(dev, afspec,
switchdev_port_obj_del);
if (!ops->ndo_bridge_dellink)
return -EOPNOTSUPP;
return ops->ndo_bridge_dellink(dev, nlh, flags);
return 0;
}
EXPORT_SYMBOL_GPL(switchdev_port_bridge_dellink);