[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150509185418.GF2290@nanopsycho>
Date: Sat, 9 May 2015 20:54:18 +0200
From: Jiri Pirko <jiri@...nulli.us>
To: sfeldma@...il.com
Cc: netdev@...r.kernel.org, roopa@...ulusnetworks.com,
linux@...ck-us.net, f.fainelli@...il.com, andrew@...n.ch,
simon.horman@...ronome.com, joe@...ches.com,
sridhar.samudrala@...el.com, ronen.arad@...el.com
Subject: Re: [PATCH net-next v6 17/23] switchdev: remove unused
switchdev_port_bridge_dellink
Sat, May 09, 2015 at 07:40:19PM CEST, sfeldma@...il.com wrote:
>From: Scott Feldman <sfeldma@...il.com>
>
>Now we can remove old wrappers for dellink.
>
>Signed-off-by: Scott Feldman <sfeldma@...il.com>
>---
> include/net/switchdev.h | 15 ---------------
> net/bridge/br_netlink.c | 11 +----------
> net/switchdev/switchdev.c | 30 ------------------------------
> 3 files changed, 1 insertion(+), 55 deletions(-)
>
...
>diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
>index e9b9435..6b67ed3 100644
>--- a/net/bridge/br_netlink.c
>+++ b/net/bridge/br_netlink.c
>@@ -639,7 +639,7 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
> {
> struct nlattr *afspec;
> struct net_bridge_port *p;
>- int err = 0, ret_offload = 0;
>+ int err = 0;
>
> afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
> if (!afspec)
>@@ -658,15 +658,6 @@ int br_dellink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
> */
> br_ifinfo_notify(RTM_NEWLINK, p);
>
>- if (p && !(flags & BRIDGE_FLAGS_SELF)) {
>- /* del bridge attributes in hardware
>- */
>- ret_offload = switchdev_port_bridge_dellink(dev, nlh, flags);
>- if (ret_offload && ret_offload != -EOPNOTSUPP)
>- br_warn(p->br, "error deleting attrs on port %u (%s)\n",
>- (unsigned int)p->port_no, p->dev->name);
>- }
>-
You should put this into a separate patch as you did for set part.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists