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
Subject: [PATCH net-next v3 19/26] switchdev: add new swdev_port_bridge_getlink
Date: Thu,  2 Apr 2015 01:10:05 -0700	[thread overview]
Message-ID: <1427962212-18411-20-git-send-email-sfeldma@gmail.com> (raw)
In-Reply-To: <1427962212-18411-1-git-send-email-sfeldma@gmail.com>

From: Scott Feldman <sfeldma@gmail.com>

Like bridge_setlink, add swdev 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 swdev code.

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

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index a88754c..efd7753 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h
@@ -115,6 +115,8 @@ int swdev_port_attr_get(struct net_device *dev, struct swdev_attr *attr);
 int swdev_port_attr_set(struct net_device *dev, struct swdev_attr *attr);
 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_getlink(struct sk_buff *skb, u32 pid, u32 seq,
+			      struct net_device *dev, u32 filter_mask);
 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,
@@ -155,6 +157,13 @@ static inline int swdev_port_obj_del(struct net_device *dev,
 	return -EOPNOTSUPP;
 }
 
+static inline int swdev_port_bridge_getlink(struct sk_buff *skb, u32 pid,
+					    u32 seq, struct net_device *dev,
+					    u32 filter_mask)
+{
+	return -EOPNOTSUPP;
+}
+
 static inline int swdev_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 19936ccc..5324248 100644
--- a/net/switchdev/switchdev.c
+++ b/net/switchdev/switchdev.c
@@ -317,6 +317,33 @@ int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev,
 }
 EXPORT_SYMBOL_GPL(call_netdev_switch_notifiers);
 
+/**
+ *	swdev_port_bridge_getlink - Get bridge port attributes
+ *
+ *	@dev: port device
+ *
+ *	Called for SELF on rtnl_bridge_getlink to get bridge port
+ *	attributes.
+ */
+int swdev_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
+			      struct net_device *dev, u32 filter_mask)
+{
+	struct swdev_attr attr = {
+		.id = SWDEV_ATTR_PORT_BRIDGE_FLAGS,
+	};
+	u16 mode = BRIDGE_MODE_UNDEF;
+	u32 mask = BR_LEARNING | BR_LEARNING_SYNC;
+	int err;
+
+	err = swdev_port_attr_get(dev, &attr);
+	if (err)
+		return err;
+
+	return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode,
+				       attr.brport_flags, mask);
+}
+EXPORT_SYMBOL_GPL(swdev_port_bridge_getlink);
+
 static int swdev_port_br_setflag(struct net_device *dev, struct nlattr *nlattr,
 				 unsigned long brport_flag)
 {
-- 
1.7.10.4

  parent reply	other threads:[~2015-04-02  8:09 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-02  8:09 [PATCH net-next v3 00/26] switchdev: spring cleanup sfeldma
2015-04-02  8:09 ` [PATCH net-next v3 01/26] switchdev: introduce get/set attrs ops sfeldma
2015-04-02  9:09   ` Florian Fainelli
2015-04-02 17:52     ` Scott Feldman
2015-04-02 18:16       ` Jiri Pirko
2015-04-04  1:44         ` roopa
2015-04-02  8:09 ` [PATCH net-next v3 02/26] switchdev: convert parent_id_get to swdev attr get sfeldma
2015-04-02  8:09 ` [PATCH net-next v3 03/26] switchdev: convert STP update to swdev attr set sfeldma
2015-04-02  8:09 ` [PATCH net-next v3 04/26] switchdev: add bridge port flags attr sfeldma
2015-04-02  8:09 ` [PATCH net-next v3 05/26] rocker: use swdev get/set attr for bridge port flags sfeldma
2015-04-02  8:09 ` [PATCH net-next v3 06/26] switchdev: introduce swdev add/del obj ops sfeldma
2015-04-02  8:09 ` [PATCH net-next v3 07/26] switchdev: add port vlan obj sfeldma
2015-04-02  8:09 ` [PATCH net-next v3 08/26] rocker: use swdev add/del obj for bridge port vlans sfeldma
2015-04-02  8:09 ` [PATCH net-next v3 09/26] switchdev: add new swdev bridge setlink sfeldma
2015-04-02  8:09 ` [PATCH net-next v3 10/26] rocker: cut over to new swdev_port_bridge_setlink sfeldma
2015-04-02  8:09 ` [PATCH net-next v3 11/26] bonding: " sfeldma
2015-04-02  8:09 ` [PATCH net-next v3 12/26] team: " sfeldma
2015-04-02  8:09 ` [PATCH net-next v3 13/26] switchdev: remove old netdev_switch_port_bridge_setlink sfeldma
2015-04-02  8:10 ` [PATCH net-next v3 14/26] switchdev: add new swdev_port_bridge_dellink sfeldma
2015-04-02  8:10 ` [PATCH net-next v3 15/26] rocker: cut over to " sfeldma
2015-04-02  8:10 ` [PATCH net-next v3 16/26] bonding: " sfeldma
2015-04-02  8:10 ` [PATCH net-next v3 17/26] team: " sfeldma
2015-04-02  8:10 ` [PATCH net-next v3 18/26] switchdev: remove unused netdev_switch_port_bridge_dellink sfeldma
2015-04-02  8:10 ` sfeldma [this message]
2015-04-04 16:56   ` [PATCH net-next v3 19/26] switchdev: add new swdev_port_bridge_getlink Arad, Ronen
2015-04-06 21:13     ` Scott Feldman
2015-04-06 21:58       ` Arad, Ronen
2015-04-02  8:10 ` [PATCH net-next v3 20/26] rocker: cut over to " sfeldma
2015-04-02  8:10 ` [PATCH net-next v3 21/26] bonding: " sfeldma
2015-04-02  8:10 ` [PATCH net-next v3 22/26] team: " sfeldma
2015-04-02  8:10 ` [PATCH net-next v3 23/26] switchdev: rename netdev_switch_fib_* to swdev_fib_* sfeldma
2015-04-02  8:10 ` [PATCH net-next v3 24/26] switchdev: rename netdev_switch_notifier_* to swdev_notifier_* sfeldma
2015-04-02  8:10 ` [PATCH net-next v3 25/26] switchdev: convert swdev_fib_ipv4_add/del over to swdev_port_obj_add/del sfeldma
2015-04-02  8:10 ` [PATCH net-next v3 26/26] switchdev: bring documentation up-to-date sfeldma
2015-04-02  8:15 ` [PATCH net-next v3 00/26] switchdev: spring cleanup Jiri Pirko

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=1427962212-18411-20-git-send-email-sfeldma@gmail.com \
    --to=sfeldma@gmail.com \
    --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).