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 14/24] bridge: restore br_setlink back to original
Date: Sun, 10 May 2015 09:47:59 -0700 [thread overview]
Message-ID: <1431276489-64199-15-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>
This is revert of:
commit 68e331c785b8 ("bridge: offload bridge port attributes to switch asic
if feature flag set")
Restore br_setlink back to original and don't call into SELF port driver.
rtnetlink.c:bridge_setlink() already does a call into port driver for SELF.
bridge set link cmd defaults to MASTER. From man page for bridge link set
cmd:
self link setting is configured on specified physical device
master link setting is configured on the software bridge (default)
The link setting has two values: the device-side value and the software
bridge-side value. These are independent and settable using the bridge
link set cmd by specifying some combination of [master] | [self].
Furthermore, the device-side and bridge-side settings have their own
initial value, viewable from bridge -d link show cmd.
Restoring br_setlink back to original makes rocker (the only in-kernel user
of SELF link settings) work as first implement: two-sided values.
It's true that when both MASTER and SELF are specified from the command,
two netlink notifications are generated, one for each side of the settings.
The user-space app can distiquish between the two notifications by
observing the MASTER or SELF flag.
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
---
net/bridge/br_netlink.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index dc23453..e9b9435 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -586,7 +586,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
struct nlattr *afspec;
struct net_bridge_port *p;
struct nlattr *tb[IFLA_BRPORT_MAX + 1];
- int err = 0, ret_offload = 0;
+ int err = 0;
protinfo = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_PROTINFO);
afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
@@ -628,15 +628,6 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
afspec, RTM_SETLINK);
}
- if (p && !(flags & BRIDGE_FLAGS_SELF)) {
- /* set bridge attributes in hardware if supported
- */
- ret_offload = switchdev_port_bridge_setlink(dev, nlh, flags);
- if (ret_offload && ret_offload != -EOPNOTSUPP)
- br_warn(p->br, "error setting attrs on port %u(%s)\n",
- (unsigned int)p->port_no, p->dev->name);
- }
-
if (err == 0)
br_ifinfo_notify(RTM_NEWLINK, p);
out:
--
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 ` [PATCH net-next v7 12/24] switchdev: cut over to new switchdev_port_bridge_setlink sfeldma
2015-05-10 16:47 ` [PATCH net-next v7 13/24] switchdev: remove old switchdev_port_bridge_setlink sfeldma
2015-05-10 16:47 ` sfeldma [this message]
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-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=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).