netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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, simon.horman@netronome.com
Subject: [PATCH net-next v5 16/21] switchdev: add new switchdev_port_bridge_getlink
Date: Tue,  5 May 2015 10:34:52 -0700	[thread overview]
Message-ID: <1430847297-15728-17-git-send-email-sfeldma@gmail.com> (raw)
In-Reply-To: <1430847297-15728-1-git-send-email-sfeldma@gmail.com>

From: Scott Feldman <sfeldma@gmail.com>

Like bridge_setlink, add switchdev wrapper to handle bridge_getlink and
call into port driver to get port attrs.  For now, only BR_LEARNING and
BR_LEARNING_SYNC are returned.  To add more, we'll probably want to break
away from ndo_dflt_bridge_getlink() and build the netlink skb directly in
the switchdev code.

Signed-off-by: Scott Feldman <sfeldma@gmail.com>
---
 include/net/switchdev.h   |   10 ++++++++++
 net/switchdev/switchdev.c |   28 ++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index 397b1e6..e081d67 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -126,6 +126,9 @@ int register_switchdev_notifier(struct notifier_block *nb);
 int unregister_switchdev_notifier(struct notifier_block *nb);
 int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
 			     struct switchdev_notifier_info *info);
+int switchdev_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
+				  struct net_device *dev, u32 filter_mask,
+				  int nlflags);
 int switchdev_port_bridge_setlink(struct net_device *dev,
 				  struct nlmsghdr *nlh, u16 flags);
 int switchdev_port_bridge_dellink(struct net_device *dev,
@@ -179,6 +182,13 @@ static inline int call_switchdev_notifiers(unsigned long val,
 	return NOTIFY_DONE;
 }
 
+static inline int switchdev_port_bridge_getlink(struct sk_buff *skb, u32 pid,
+					    u32 seq, struct net_device *dev,
+					    u32 filter_mask, int nlflags)
+{
+	return -EOPNOTSUPP;
+}
+
 static inline int switchdev_port_bridge_setlink(struct net_device *dev,
 						struct nlmsghdr *nlh,
 						u16 flags)
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c
index 0e15b6f..9210355 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -358,6 +358,34 @@ int call_switchdev_notifiers(unsigned long val, struct net_device *dev,
 }
 EXPORT_SYMBOL_GPL(call_switchdev_notifiers);
 
+/**
+ *	switchdev_port_bridge_getlink - Get bridge port attributes
+ *
+ *	@dev: port device
+ *
+ *	Called for SELF on rtnl_bridge_getlink to get bridge port
+ *	attributes.
+ */
+int switchdev_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
+				  struct net_device *dev, u32 filter_mask,
+				  int nlflags)
+{
+	struct switchdev_attr attr = {
+		.id = SWITCHDEV_ATTR_PORT_BRIDGE_FLAGS,
+	};
+	u16 mode = BRIDGE_MODE_UNDEF;
+	u32 mask = BR_LEARNING | BR_LEARNING_SYNC;
+	int err;
+
+	err = switchdev_port_attr_get(dev, &attr);
+	if (err)
+		return err;
+
+	return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode,
+				       attr.brport_flags, mask, nlflags);
+}
+EXPORT_SYMBOL_GPL(switchdev_port_bridge_getlink);
+
 static int switchdev_port_br_setflag(struct net_device *dev,
 				     struct nlattr *nlattr,
 				     unsigned long brport_flag)
-- 
1.7.10.4

  parent reply	other threads:[~2015-05-05 17:34 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-05 17:34 [PATCH net-next v5 00/21] switchdev: spring cleanup sfeldma
2015-05-05 17:34 ` [PATCH net-next v5 01/21] switchdev: s/netdev_switch_/switchdev_/ and s/NETDEV_SWITCH_/SWITCHDEV_/ sfeldma
2015-05-05 17:34 ` [PATCH net-next v5 02/21] switchdev: s/swdev_/switchdev_/ sfeldma
2015-05-05 17:34 ` [PATCH net-next v5 03/21] switchdev: introduce get/set attrs ops sfeldma
2015-05-06  3:11   ` Jiri Pirko
2015-05-05 17:34 ` [PATCH net-next v5 04/21] switchdev: convert parent_id_get to switchdev attr get sfeldma
2015-05-06  3:13   ` Jiri Pirko
2015-05-05 17:34 ` [PATCH net-next v5 05/21] switchdev: convert STP update to switchdev attr set sfeldma
2015-05-06  3:22   ` Jiri Pirko
2015-05-06  5:32     ` Scott Feldman
2015-05-05 17:34 ` [PATCH net-next v5 06/21] switchdev: introduce switchdev add/del obj ops sfeldma
2015-05-06  6:37   ` Samudrala, Sridhar
2015-05-06 18:23   ` Jiri Pirko
2015-05-05 17:34 ` [PATCH net-next v5 07/21] switchdev: add port vlan obj sfeldma
2015-05-06 18:23   ` Jiri Pirko
2015-05-05 17:34 ` [PATCH net-next v5 08/21] rocker: use switchdev add/del obj for bridge port vlans sfeldma
2015-05-06 18:23   ` Jiri Pirko
2015-05-05 17:34 ` [PATCH net-next v5 09/21] switchdev: add bridge port flags attr sfeldma
2015-05-05 17:34 ` [PATCH net-next v5 10/21] switchdev: add new switchdev bridge setlink sfeldma
2015-05-05 17:34 ` [PATCH net-next v5 11/21] switchdev: cut over to new switchdev_port_bridge_setlink sfeldma
2015-05-05 17:34 ` [PATCH net-next v5 12/21] switchdev: remove old switchdev_port_bridge_setlink sfeldma
2015-05-06  4:33   ` roopa
2015-05-07 15:33   ` Jiri Pirko
2015-05-07 15:36   ` Jiri Pirko
2015-05-08  5:07     ` Scott Feldman
2015-05-05 17:34 ` [PATCH net-next v5 13/21] switchdev: add new switchdev_port_bridge_dellink sfeldma
2015-05-05 17:34 ` [PATCH net-next v5 14/21] switchdev: cut over to " sfeldma
2015-05-05 17:34 ` [PATCH net-next v5 15/21] switchdev: remove unused switchdev_port_bridge_dellink sfeldma
2015-05-05 17:34 ` sfeldma [this message]
2015-05-07 15:48   ` [PATCH net-next v5 16/21] switchdev: add new switchdev_port_bridge_getlink Jiri Pirko
2015-05-05 17:34 ` [PATCH net-next v5 17/21] switchdev: cut over to " sfeldma
2015-05-07 15:49   ` Jiri Pirko
2015-05-05 17:34 ` [PATCH net-next v5 18/21] switchdev: convert fib_ipv4_add/del over to switchdev_port_obj_add/del sfeldma
2015-05-07 16:10   ` Jiri Pirko
2015-05-08 14:19     ` John Fastabend
2015-05-09  7:10       ` Jiri Pirko
2015-05-05 17:34 ` [PATCH net-next v5 19/21] switchdev: remove NETIF_F_HW_SWITCH_OFFLOAD feature flag sfeldma
2015-05-07 16:10   ` Jiri Pirko
2015-05-05 17:34 ` [PATCH net-next v5 20/21] rocker: make checkpatch -f clean sfeldma
2015-05-05 17:45   ` Joe Perches
2015-05-05 18:13     ` Jiri Pirko
2015-05-05 20:01     ` Scott Feldman
2015-05-05 18:22   ` Joe Perches
2015-05-05 17:34 ` [PATCH net-next v5 21/21] switchdev: bring documentation up-to-date sfeldma

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=1430847297-15728-17-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=simon.horman@netronome.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).