From: sfeldma@gmail.com
To: netdev@vger.kernel.org
Cc: jiri@resnulli.us, roopa@cumulusnetworks.com, linux@roeck-us.net,
f.fainelli@gmail.com
Subject: [PATCH net-next 08/18] rocker: cut over to new swdev_port_bridge_setlink
Date: Mon, 30 Mar 2015 01:40:26 -0700 [thread overview]
Message-ID: <1427704836-8776-9-git-send-email-sfeldma@gmail.com> (raw)
In-Reply-To: <1427704836-8776-1-git-send-email-sfeldma@gmail.com>
From: Scott Feldman <sfeldma@gmail.com>
Rocker can now use the swdev bridge setlink to parse raw netlink; no need
to duplicate this code in each driver.
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
---
drivers/net/ethernet/rocker/rocker.c | 41 +---------------------------------
1 file changed, 1 insertion(+), 40 deletions(-)
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index bc4fd33..475ce93 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4135,45 +4135,6 @@ skip:
return idx;
}
-static int rocker_port_bridge_setlink(struct net_device *dev,
- struct nlmsghdr *nlh, u16 flags)
-{
- struct rocker_port *rocker_port = netdev_priv(dev);
- struct nlattr *protinfo;
- struct nlattr *attr;
- int err;
-
- protinfo = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg),
- IFLA_PROTINFO);
- if (protinfo) {
- attr = nla_find_nested(protinfo, IFLA_BRPORT_LEARNING);
- if (attr) {
- if (nla_len(attr) < sizeof(u8))
- return -EINVAL;
-
- if (nla_get_u8(attr))
- rocker_port->brport_flags |= BR_LEARNING;
- else
- rocker_port->brport_flags &= ~BR_LEARNING;
- err = rocker_port_set_learning(rocker_port);
- if (err)
- return err;
- }
- attr = nla_find_nested(protinfo, IFLA_BRPORT_LEARNING_SYNC);
- if (attr) {
- if (nla_len(attr) < sizeof(u8))
- return -EINVAL;
-
- if (nla_get_u8(attr))
- rocker_port->brport_flags |= BR_LEARNING_SYNC;
- else
- rocker_port->brport_flags &= ~BR_LEARNING_SYNC;
- }
- }
-
- return 0;
-}
-
static int rocker_port_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev,
u32 filter_mask)
@@ -4211,7 +4172,7 @@ static const struct net_device_ops rocker_port_netdev_ops = {
.ndo_fdb_add = rocker_port_fdb_add,
.ndo_fdb_del = rocker_port_fdb_del,
.ndo_fdb_dump = rocker_port_fdb_dump,
- .ndo_bridge_setlink = rocker_port_bridge_setlink,
+ .ndo_bridge_setlink = swdev_port_bridge_setlink,
.ndo_bridge_getlink = rocker_port_bridge_getlink,
.ndo_get_phys_port_name = rocker_port_get_phys_port_name,
};
--
1.7.10.4
next prev parent reply other threads:[~2015-03-30 8:39 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-30 8:40 [PATCH net-next 00/18] switchdev: spring cleanup sfeldma
2015-03-30 8:40 ` [PATCH net-next 01/18] switchdev: introduce get/set attrs ops sfeldma
2015-03-30 8:40 ` [PATCH net-next 02/18] switchdev: flesh out get/set attr ops sfeldma
2015-03-30 11:55 ` Jiri Pirko
2015-03-30 18:32 ` Arad, Ronen
2015-03-30 20:46 ` Jiri Pirko
2015-03-30 21:00 ` Scott Feldman
2015-03-31 0:22 ` Arad, Ronen
2015-03-31 0:38 ` Scott Feldman
2015-03-31 15:37 ` roopa
[not found] ` <CAJieiUh0Svt3LZsgoi7RaV8Be0eFyRvoJU3BmW7v3fEvwfXiHg@mail.gmail.com>
2015-03-31 16:05 ` Scott Feldman
2015-03-30 8:40 ` [PATCH net-next 03/18] switchdev: convert parent_id_get to swdev attr get sfeldma
2015-03-30 8:40 ` [PATCH net-next 04/18] switchdev: convert STP update to swdev attr set sfeldma
2015-03-30 11:54 ` Jiri Pirko
2015-03-30 13:47 ` roopa
2015-03-30 8:40 ` [PATCH net-next 05/18] switchdev: add bridge port flags attr sfeldma
2015-03-30 8:40 ` [PATCH net-next 06/18] rocker: use swdev get/set attr for bridge port flags sfeldma
2015-03-30 12:01 ` Jiri Pirko
2015-03-30 8:40 ` [PATCH net-next 07/18] switchdev: add new swdev bridge setlink sfeldma
2015-03-30 12:31 ` Jiri Pirko
2015-03-30 8:40 ` sfeldma [this message]
2015-03-30 8:40 ` [PATCH net-next 09/18] bonding: cut over to new swdev_port_bridge_setlink sfeldma
2015-03-30 8:40 ` [PATCH net-next 10/18] team: " sfeldma
2015-03-30 8:40 ` [PATCH net-next 11/18] switchdev: remove old netdev_switch_port_bridge_setlink sfeldma
2015-03-30 13:23 ` roopa
2015-03-30 20:20 ` Scott Feldman
2015-03-30 20:46 ` Arad, Ronen
2015-03-30 21:27 ` Scott Feldman
2015-03-31 0:08 ` Arad, Ronen
2015-03-31 0:44 ` Scott Feldman
2015-03-31 5:52 ` Jiri Pirko
2015-03-31 19:15 ` Arad, Ronen
2015-03-31 21:52 ` Jiri Pirko
2015-03-31 23:32 ` Arad, Ronen
2015-04-01 2:38 ` Scott Feldman
2015-04-01 12:03 ` Jamal Hadi Salim
2015-04-01 17:56 ` Scott Feldman
2015-04-02 1:01 ` Florian Fainelli
2015-03-30 8:40 ` [PATCH net-next 12/18] switchdev: remove unused netdev_switch_port_bridge_dellink sfeldma
2015-03-30 13:23 ` roopa
2015-03-30 8:40 ` [PATCH net-next 13/18] switchdev: remove unused NETIF_F_HW_SWITCH_OFFLOAD sfeldma
2015-03-30 13:38 ` roopa
2015-03-30 20:48 ` Samudrala, Sridhar
2015-03-30 21:20 ` Scott Feldman
2015-03-31 15:34 ` roopa
[not found] ` <CAJieiUiL4QRQAC30=bkYadYD2L2cOcn7mNLV98uH3Go0exMO+A@mail.gmail.com>
2015-03-31 16:03 ` Scott Feldman
2015-03-30 8:40 ` [PATCH net-next 14/18] switchdev: add new swdev_port_bridge_getlink sfeldma
2015-03-30 8:40 ` [PATCH net-next 15/18] rocker: cut over to " sfeldma
2015-03-30 8:40 ` [PATCH net-next 16/18] switchdev: rename netdev_switch_fib_* to swdev_fib_* sfeldma
2015-03-30 8:40 ` [PATCH net-next 17/18] switchdev: rename netdev_switch_notifier_* to swdev_notifier_* sfeldma
2015-03-30 8:40 ` [PATCH net-next 18/18] switchdev: bring documentation up-to-date sfeldma
2015-03-30 12:00 ` [PATCH net-next 00/18] switchdev: spring cleanup Jiri Pirko
2015-03-30 13:11 ` Andy Gospodarek
2015-03-30 15:00 ` roopa
2015-03-30 16:11 ` Or Gerlitz
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=1427704836-8776-9-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=roopa@cumulusnetworks.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).