From: sfeldma@gmail.com
To: netdev@vger.kernel.org
Cc: jiri@resnulli.us, roopa@cumulusnetworks.com, linux@roeck-us.net,
f.fainelli@gmail.com, andrew@lunn.ch, simon.horman@netronome.com,
joe@perches.com, sridhar.samudrala@intel.com,
ronen.arad@intel.com
Subject: [PATCH net-next v7 12/24] switchdev: cut over to new switchdev_port_bridge_setlink
Date: Sun, 10 May 2015 09:47:57 -0700 [thread overview]
Message-ID: <1431276489-64199-13-git-send-email-sfeldma@gmail.com> (raw)
In-Reply-To: <1431276489-64199-1-git-send-email-sfeldma@gmail.com>
From: Scott Feldman <sfeldma@gmail.com>
Rocker, bonding, and team can now use the switchdev bridge setlink to parse
raw netlink; no need to duplicate this code in each driver.
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
---
drivers/net/bonding/bond_main.c | 2 +-
drivers/net/ethernet/rocker/rocker.c | 42 +---------------------------------
drivers/net/team/team.c | 2 +-
3 files changed, 3 insertions(+), 43 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 8e62180..e1d8a03 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4039,7 +4039,7 @@ static const struct net_device_ops bond_netdev_ops = {
.ndo_add_slave = bond_enslave,
.ndo_del_slave = bond_release,
.ndo_fix_features = bond_fix_features,
- .ndo_bridge_setlink = ndo_dflt_switchdev_port_bridge_setlink,
+ .ndo_bridge_setlink = switchdev_port_bridge_setlink,
.ndo_bridge_dellink = ndo_dflt_switchdev_port_bridge_dellink,
.ndo_features_check = passthru_features_check,
};
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c
index ceb6a64..e94089e 100644
--- a/drivers/net/ethernet/rocker/rocker.c
+++ b/drivers/net/ethernet/rocker/rocker.c
@@ -4295,46 +4295,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,
- SWITCHDEV_TRANS_NONE);
- 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, int nlflags)
@@ -4374,7 +4334,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 = switchdev_port_bridge_setlink,
.ndo_bridge_getlink = rocker_port_bridge_getlink,
.ndo_get_phys_port_name = rocker_port_get_phys_port_name,
};
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index cfe8496..e6c4df2 100644
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -1977,7 +1977,7 @@ static const struct net_device_ops team_netdev_ops = {
.ndo_del_slave = team_del_slave,
.ndo_fix_features = team_fix_features,
.ndo_change_carrier = team_change_carrier,
- .ndo_bridge_setlink = ndo_dflt_switchdev_port_bridge_setlink,
+ .ndo_bridge_setlink = switchdev_port_bridge_setlink,
.ndo_bridge_dellink = ndo_dflt_switchdev_port_bridge_dellink,
.ndo_features_check = passthru_features_check,
};
--
1.7.10.4
next prev parent reply other threads:[~2015-05-10 16:47 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-10 16:47 [PATCH net-next v7 00/24] switchdev: spring cleanup sfeldma
2015-05-10 16:47 ` [PATCH net-next v7 01/24] switchdev: s/netdev_switch_/switchdev_/ and s/NETDEV_SWITCH_/SWITCHDEV_/ sfeldma
2015-05-10 16:47 ` [PATCH net-next v7 02/24] switchdev: s/swdev_/switchdev_/ sfeldma
2015-05-10 16:47 ` [PATCH net-next v7 03/24] switchdev: introduce get/set attrs ops sfeldma
2015-05-10 16:47 ` [PATCH net-next v7 04/24] switchdev: convert parent_id_get to switchdev attr get sfeldma
2015-05-10 16:47 ` [PATCH net-next v7 05/24] rocker: support prepare-commit transaction model sfeldma
2015-05-10 19:20 ` Jiri Pirko
2015-05-10 16:47 ` [PATCH net-next v7 06/24] switchdev: convert STP update to switchdev attr set sfeldma
2015-05-10 19:29 ` Jiri Pirko
2015-05-10 16:47 ` [PATCH net-next v7 07/24] switchdev: introduce switchdev add/del obj ops sfeldma
2015-05-10 16:47 ` [PATCH net-next v7 08/24] switchdev: add port vlan obj sfeldma
2015-05-10 16:47 ` [PATCH net-next v7 09/24] rocker: use switchdev add/del obj for bridge port vlans sfeldma
2015-05-10 16:47 ` [PATCH net-next v7 10/24] switchdev: add bridge port flags attr sfeldma
2015-05-10 16:47 ` [PATCH net-next v7 11/24] switchdev: add new switchdev bridge setlink sfeldma
2015-05-10 16:47 ` sfeldma [this message]
2015-05-10 16:47 ` [PATCH net-next v7 13/24] switchdev: remove old switchdev_port_bridge_setlink sfeldma
2015-05-10 16:47 ` [PATCH net-next v7 14/24] bridge: restore br_setlink back to original sfeldma
2015-05-10 16:48 ` [PATCH net-next v7 15/24] switchdev: add new switchdev_port_bridge_dellink sfeldma
2015-05-10 19:58 ` Jiri Pirko
2015-05-10 16:48 ` [PATCH net-next v7 16/24] switchdev: cut over to " sfeldma
2015-05-10 19:58 ` Jiri Pirko
2015-05-10 16:48 ` [PATCH net-next v7 17/24] switchdev: remove unused switchdev_port_bridge_dellink sfeldma
2015-05-10 19:58 ` Jiri Pirko
2015-05-10 16:48 ` [PATCH net-next v7 18/24] bridge: revert br_dellink change back to original sfeldma
2015-05-10 19:59 ` Jiri Pirko
2015-05-10 16:48 ` [PATCH net-next v7 19/24] switchdev: add new switchdev_port_bridge_getlink sfeldma
2015-05-10 16:48 ` [PATCH net-next v7 20/24] switchdev: cut over to " sfeldma
2015-05-10 16:48 ` [PATCH net-next v7 21/24] switchdev: convert fib_ipv4_add/del over to switchdev_port_obj_add/del sfeldma
2015-05-10 16:48 ` [PATCH net-next v7 22/24] switchdev: remove NETIF_F_HW_SWITCH_OFFLOAD feature flag sfeldma
2015-05-10 16:48 ` [PATCH net-next v7 23/24] rocker: make checkpatch -f clean sfeldma
2015-05-10 20:07 ` Jiri Pirko
2015-05-10 16:48 ` [PATCH net-next v7 24/24] switchdev: bring documentation up-to-date sfeldma
2015-05-11 18:33 ` Jiri Pirko
2015-05-11 21:02 ` Rosen, Rami
2015-05-13 5:37 ` Scott Feldman
2015-05-12 22:45 ` [PATCH net-next v7 00/24] switchdev: spring cleanup David Miller
2015-05-14 9:30 ` Simon Horman
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=1431276489-64199-13-git-send-email-sfeldma@gmail.com \
--to=sfeldma@gmail.com \
--cc=andrew@lunn.ch \
--cc=f.fainelli@gmail.com \
--cc=jiri@resnulli.us \
--cc=joe@perches.com \
--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).