From: Scott Feldman <redacted>

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 <redacted>
---
include/net/switchdev.h   |   17 -----------------
net/bridge/br_netlink.c   |   11 +----------
net/switchdev/switchdev.c |   30 ------------------------------
3 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/include/net/switchdev.h b/include/net/switchdev.h
index aa6c370..ce5ceb2 100644
--- a/include/net/switchdev.h
+++ b/include/net/switchdev.h

@@ -122,8 +122,6 @@ int switchdev_port_attr_set(struct net_device *dev,

			    struct switchdev_attr *attr);
int switchdev_port_obj_add(struct net_device *dev, struct switchdev_obj *obj);
int switchdev_port_obj_del(struct net_device *dev, struct switchdev_obj *obj);
-int switchdev_port_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,
-			      u16 flags);