From: roopa <roopa@cumulusnetworks•com>
To: sfeldma@gmail•com
Cc: netdev@vger•kernel.org, jiri@resnulli•us, linux@roeck-us•net,
f.fainelli@gmail•com, sridhar.samudrala@intel•com,
ronen.arad@intel•com, andrew@lunn•ch
Subject: Re: [PATCH net-next v4 13/24] switchdev: remove old netdev_switch_port_bridge_setlink
Date: Mon, 13 Apr 2015 21:07:35 -0700 [thread overview]
Message-ID: <552C9287.6080904@cumulusnetworks.com> (raw)
In-Reply-To: <1428905838-14920-14-git-send-email-sfeldma@gmail.com>
On 4/12/15, 11:17 PM, sfeldma@gmail•com wrote:
> From: Scott Feldman <sfeldma@gmail•com>
>
> New attr-based bridge_setlink can recurse lower devs and recover on err, so
> remove old wrapper. Also, 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.
>
> Signed-off-by: Scott Feldman <sfeldma@gmail•com>
> ---
> include/net/switchdev.h | 18 ---------------
> net/bridge/br_netlink.c | 12 +---------
> net/switchdev/switchdev.c | 55 ---------------------------------------------
> 3 files changed, 1 insertion(+), 84 deletions(-)
>
> diff --git a/include/net/switchdev.h b/include/net/switchdev.h
> index cff53ae..70874fc 100644
> --- a/include/net/switchdev.h
> +++ b/include/net/switchdev.h
> @@ -127,14 +127,10 @@ int register_netdev_switch_notifier(struct notifier_block *nb);
> int unregister_netdev_switch_notifier(struct notifier_block *nb);
> int call_netdev_switch_notifiers(unsigned long val, struct net_device *dev,
> struct netdev_switch_notifier_info *info);
> -int netdev_switch_port_bridge_setlink(struct net_device *dev,
> - struct nlmsghdr *nlh, u16 flags);
> int netdev_switch_port_bridge_dellink(struct net_device *dev,
> struct nlmsghdr *nlh, u16 flags);
> int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *dev,
> struct nlmsghdr *nlh, u16 flags);
> -int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *dev,
> - struct nlmsghdr *nlh, u16 flags);
> int netdev_switch_fib_ipv4_add(u32 dst, int dst_len, struct fib_info *fi,
> u8 tos, u8 type, u32 nlflags, u32 tb_id);
> int netdev_switch_fib_ipv4_del(u32 dst, int dst_len, struct fib_info *fi,
> @@ -189,13 +185,6 @@ static inline int call_netdev_switch_notifiers(unsigned long val, struct net_dev
> return NOTIFY_DONE;
> }
>
> -static inline int netdev_switch_port_bridge_setlink(struct net_device *dev,
> - struct nlmsghdr *nlh,
> - u16 flags)
> -{
> - return -EOPNOTSUPP;
> -}
> -
> static inline int netdev_switch_port_bridge_dellink(struct net_device *dev,
> struct nlmsghdr *nlh,
> u16 flags)
> @@ -210,13 +199,6 @@ static inline int ndo_dflt_netdev_switch_port_bridge_dellink(struct net_device *
> return 0;
> }
>
> -static inline int ndo_dflt_netdev_switch_port_bridge_setlink(struct net_device *dev,
> - struct nlmsghdr *nlh,
> - u16 flags)
> -{
> - return 0;
> -}
> -
> static inline int netdev_switch_fib_ipv4_add(u32 dst, int dst_len,
> struct fib_info *fi,
> u8 tos, u8 type,
> diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
> index 0e4ddb8..45ed1ce 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,16 +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 = netdev_switch_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);
> - }
> -
This was there to keep the offload semantics consistent with offload of
other kernel objects (eg. fib).
your patch-set mandates 'master' and 'self' to program hardware and this
also generates two notifications
to users-pace.
next prev parent reply other threads:[~2015-04-14 4:07 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 6:16 [PATCH net-next v4 00/24] switchdev: spring cleanup sfeldma
2015-04-13 6:16 ` [PATCH net-next v4 01/24] switchdev: introduce get/set attrs ops sfeldma
2015-04-13 10:43 ` Jiri Pirko
2015-04-14 7:02 ` Scott Feldman
2015-04-13 6:16 ` [PATCH net-next v4 02/24] switchdev: convert parent_id_get to swdev attr get sfeldma
2015-04-13 6:16 ` [PATCH net-next v4 03/24] switchdev: convert STP update to swdev attr set sfeldma
2015-04-13 19:22 ` Florian Fainelli
2015-04-14 7:51 ` Scott Feldman
2015-04-13 6:16 ` [PATCH net-next v4 04/24] switchdev: add bridge port flags attr sfeldma
2015-04-13 6:16 ` [PATCH net-next v4 05/24] rocker: use swdev get/set attr for bridge port flags sfeldma
2015-04-13 10:48 ` Jiri Pirko
2015-04-15 5:25 ` Simon Horman
2015-04-15 6:03 ` Scott Feldman
2015-04-15 8:03 ` Simon Horman
2015-04-13 6:17 ` [PATCH net-next v4 06/24] switchdev: introduce swdev add/del obj ops sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 07/24] switchdev: add port vlan obj sfeldma
2015-04-13 13:16 ` Jiri Pirko
2015-04-13 13:27 ` Jiri Pirko
2015-04-13 17:49 ` Florian Fainelli
2015-04-14 7:28 ` Scott Feldman
2015-04-13 6:17 ` [PATCH net-next v4 08/24] rocker: use swdev add/del obj for bridge port vlans sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 09/24] switchdev: add new swdev bridge setlink sfeldma
2015-04-14 4:09 ` roopa
2015-04-14 5:30 ` Jiri Pirko
2015-04-14 5:46 ` roopa
2015-04-13 6:17 ` [PATCH net-next v4 10/24] rocker: cut over to new swdev_port_bridge_setlink sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 11/24] bonding: " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 12/24] team: " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 13/24] switchdev: remove old netdev_switch_port_bridge_setlink sfeldma
2015-04-14 4:07 ` roopa [this message]
2015-04-13 6:17 ` [PATCH net-next v4 14/24] switchdev: add new swdev_port_bridge_dellink sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 15/24] rocker: cut over to " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 16/24] bonding: " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 17/24] team: " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 18/24] switchdev: remove unused netdev_switch_port_bridge_dellink sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 19/24] switchdev: add new swdev_port_bridge_getlink sfeldma
2015-04-14 5:47 ` roopa
2015-04-14 7:59 ` Scott Feldman
2015-04-13 6:17 ` [PATCH net-next v4 20/24] rocker: cut over to " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 21/24] bonding: " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 22/24] team: " sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 23/24] switchdev: convert fib_ipv4_add/del over to swdev_port_obj_add/del sfeldma
2015-04-13 6:17 ` [PATCH net-next v4 24/24] switchdev: bring documentation up-to-date sfeldma
2015-04-13 8:24 ` [PATCH net-next v4 00/24] switchdev: spring cleanup Jiri Pirko
2015-04-14 5:47 ` roopa
2015-04-17 4:48 ` roopa
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=552C9287.6080904@cumulusnetworks.com \
--to=roopa@cumulusnetworks$(echo .)com \
--cc=andrew@lunn$(echo .)ch \
--cc=f.fainelli@gmail$(echo .)com \
--cc=jiri@resnulli$(echo .)us \
--cc=linux@roeck-us$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=ronen.arad@intel$(echo .)com \
--cc=sfeldma@gmail$(echo .)com \
--cc=sridhar.samudrala@intel$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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