|
@@ -586,7 +586,7 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh, u16 flags)
|
|
struct nlattr *afspec;
|
|
struct nlattr *afspec;
|
|
struct net_bridge_port *p;
|
|
struct net_bridge_port *p;
|
|
struct nlattr *tb[IFLA_BRPORT_MAX + 1];
|
|
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);
|
|
protinfo = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_PROTINFO);
|
|
afspec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC);
|
|
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);
|
|
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)
|
|
if (err == 0)
|
|
br_ifinfo_notify(RTM_NEWLINK, p);
|
|
br_ifinfo_notify(RTM_NEWLINK, p);
|
|
out:
|
|
out:
|