summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorScott Feldman <sfeldma@gmail.com>2015-05-10 09:48:00 -0700
committerDavid S. Miller <davem@davemloft.net>2015-05-12 18:43:55 -0400
commit5c34e0221423aeabc0b085adc5fccda3f91e2c49 (patch)
tree41f6a10a4404930804b6602266a701a1dbfe420e /net
parent41c498b9359e360f08723b7605ec0c40926ec415 (diff)
downloadlinux-5c34e0221423aeabc0b085adc5fccda3f91e2c49.tar.bz2
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>
Diffstat (limited to 'net')
-rw-r--r--net/switchdev/switchdev.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index dcdec9de9137..8ce678e397b4 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -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);