From: sfeldma@gmail.com
To: netdev@vger.kernel.org
Cc: jiri@resnulli.us, roopa@cumulusnetworks.com, linux@roeck-us.net,
f.fainelli@gmail.com, sridhar.samudrala@intel.com,
ronen.arad@intel.com, andrew@lunn.ch
Subject: [PATCH net-next v4 14/24] switchdev: add new swdev_port_bridge_dellink
Date: Sun, 12 Apr 2015 23:17:08 -0700 [thread overview]
Message-ID: <1428905838-14920-15-git-send-email-sfeldma@gmail.com> (raw)
In-Reply-To: <1428905838-14920-1-git-send-email-sfeldma@gmail.com>
From: Scott Feldman <sfeldma@gmail.com>
Same change as setlink. Provide the wrapper op for SELF ndo_bridge_dellink
and call into the swdev driver to delete afspec VLANs.
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
---
include/net/switchdev.h | 8 ++++++++
net/switchdev/switchdev.c | 24 ++++++++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 70874fc..5443c9b 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -123,6 +123,8 @@ int swdev_port_obj_add(struct net_device *dev, struct swdev_obj *obj);
int swdev_port_obj_del(struct net_device *dev, struct swdev_obj *obj);
int swdev_port_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,
u16 flags);
+int swdev_port_bridge_dellink(struct net_device *dev, struct nlmsghdr *nlh,
+ u16 flags);
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,
@@ -169,6 +171,12 @@ static inline int swdev_port_bridge_setlink(struct net_device *dev,
return -EOPNOTSUPP;
}
+static inline int swdev_port_bridge_dellink(struct net_device *dev,
+ struct nlmsghdr *nlh, u16 flags)
+{
+ return -EOPNOTSUPP;
+}
+
static inline int register_netdev_switch_notifier(struct notifier_block *nb)
{
return 0;
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 6691537..febd67e 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -523,6 +523,30 @@ int swdev_port_bridge_setlink(struct net_device *dev,
EXPORT_SYMBOL_GPL(swdev_port_bridge_setlink);
/**
+ * swdev_port_bridge_dellink - Set bridge port attributes
+ *
+ * @dev: port device
+ * @nlh: netlink header
+ * @flags: netlink flags
+ *
+ * Called for SELF on rtnl_bridge_dellink to set bridge port
+ * attributes.
+ */
+int swdev_port_bridge_dellink(struct net_device *dev,
+ struct nlmsghdr *nlh, u16 flags)
+{
+ struct nlattr *afspec;
+
+ afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg),
+ IFLA_AF_SPEC);
+ if (afspec)
+ return swdev_port_br_afspec(dev, afspec, swdev_port_obj_del);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(swdev_port_bridge_dellink);
+
+/**
* netdev_switch_port_bridge_dellink - Notify switch device port of bridge
* port attribute delete
*
--
1.7.10.4
next prev parent reply other threads:[~2015-04-13 6:16 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 6:16 [PATCH net-next v4 00/24] switchdev: spring cleanup sfeldma
2015-04-13 6:16 ` [PATCH net-next v4 01/24] switchdev: introduce get/set attrs ops sfeldma
2015-04-13 10:43 ` Jiri Pirko
2015-04-14 7:02 ` Scott Feldman
2015-04-13 6:16 ` [PATCH net-next v4 02/24] switchdev: convert parent_id_get to swdev attr get sfeldma
2015-04-13 6:16 ` [PATCH net-next v4 03/24] switchdev: convert STP update to swdev attr set sfeldma
2015-04-13 19:22 ` Florian Fainelli
2015-04-14 7:51 ` Scott Feldman
2015-04-13 6:16 ` [PATCH net-next v4 04/24] switchdev: add bridge port flags attr sfeldma
2015-04-13 6:16 ` [PATCH net-next v4 05/24] rocker: use swdev get/set attr for bridge port flags sfeldma
2015-04-13 10:48 ` Jiri Pirko
2015-04-15 5:25 ` Simon Horman
2015-04-15 6:03 ` Scott Feldman
2015-04-15 8:03 ` Simon Horman
2015-04-13 6:17 ` [PATCH net-next v4 06/24] switchdev: introduce swdev add/del obj ops sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 07/24] switchdev: add port vlan obj sfeldma
2015-04-13 13:16 ` Jiri Pirko
2015-04-13 13:27 ` Jiri Pirko
2015-04-13 17:49 ` Florian Fainelli
2015-04-14 7:28 ` Scott Feldman
2015-04-13 6:17 ` [PATCH net-next v4 08/24] rocker: use swdev add/del obj for bridge port vlans sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 09/24] switchdev: add new swdev bridge setlink sfeldma
2015-04-14 4:09 ` roopa
2015-04-14 5:30 ` Jiri Pirko
2015-04-14 5:46 ` roopa
2015-04-13 6:17 ` [PATCH net-next v4 10/24] rocker: cut over to new swdev_port_bridge_setlink sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 11/24] bonding: " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 12/24] team: " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 13/24] switchdev: remove old netdev_switch_port_bridge_setlink sfeldma
2015-04-14 4:07 ` roopa
2015-04-13 6:17 ` sfeldma [this message]
2015-04-13 6:17 ` [PATCH net-next v4 15/24] rocker: cut over to new swdev_port_bridge_dellink sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 16/24] bonding: " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 17/24] team: " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 18/24] switchdev: remove unused netdev_switch_port_bridge_dellink sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 19/24] switchdev: add new swdev_port_bridge_getlink sfeldma
2015-04-14 5:47 ` roopa
2015-04-14 7:59 ` Scott Feldman
2015-04-13 6:17 ` [PATCH net-next v4 20/24] rocker: cut over to " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 21/24] bonding: " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 22/24] team: " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 23/24] switchdev: convert fib_ipv4_add/del over to swdev_port_obj_add/del sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 24/24] switchdev: bring documentation up-to-date sfeldma
2015-04-13 8:24 ` [PATCH net-next v4 00/24] switchdev: spring cleanup Jiri Pirko
2015-04-14 5:47 ` roopa
2015-04-17 4:48 ` roopa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428905838-14920-15-git-send-email-sfeldma@gmail.com \
--to=sfeldma@gmail.com \
--cc=andrew@lunn.ch \
--cc=f.fainelli@gmail.com \
--cc=jiri@resnulli.us \
--cc=linux@roeck-us.net \
--cc=netdev@vger.kernel.org \
--cc=ronen.arad@intel.com \
--cc=roopa@cumulusnetworks.com \
--cc=sridhar.samudrala@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).