Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8508025c authored by Scott Feldman's avatar Scott Feldman Committed by David S. Miller
Browse files

bridge: revert br_dellink change back to original 



This is revert of:

commit 68e331c7 ("bridge: offload bridge port attributes to switch asic
if feature flag set")

Restore br_dellink back to original and don't call into SELF port driver.
rtnetlink.c:bridge_dellink() already does a call into port driver for SELF.

bridge vlan add/del cmd defaults to MASTER.  From man page for bridge vlan
add/del cmd:

       self   the vlan is configured on the specified physical device.
              Required if the device is the bridge device.

       master the vlan is configured on the software bridge (default).

Signed-off-by: default avatarScott Feldman <sfeldma@gmail.com>
Acked-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 87a5dae5

net/bridge/br_netlink.c

+1 −10
Original line number Diff line number Diff line
@@ -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);

	}



	return err;

}

static int br_validate(struct nlattr *tb[], struct nlattr *data[])