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

Commit a26d94bf authored by YueHaibing's avatar YueHaibing Committed by David S. Miller
Browse files

net: bridge: remove unneeded variable 'err' 



function br_multicast_toggle now always return 0,
so the variable 'err' is unneeded.
Also cleanup dead branch in br_changelink.

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Acked-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8937388a

net/bridge/br_multicast.c

+1 −2
Original line number Diff line number Diff line
@@ -1937,7 +1937,6 @@ static void br_multicast_start_querier(struct net_bridge *br, 
int br_multicast_toggle(struct net_bridge *br, unsigned long val)

{

	struct net_bridge_port *port;

	int err = 0;



	spin_lock_bh(&br->multicast_lock);

	if (!!br_opt_get(br, BROPT_MULTICAST_ENABLED) == !!val)
@@ -1958,7 +1957,7 @@ int br_multicast_toggle(struct net_bridge *br, unsigned long val) 
unlock:

	spin_unlock_bh(&br->multicast_lock);



	return err;

	return 0;

}



bool br_multicast_enabled(const struct net_device *dev)

net/bridge/br_netlink.c

+1 −3
Original line number Diff line number Diff line
@@ -1175,9 +1175,7 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], 
	if (data[IFLA_BR_MCAST_SNOOPING]) {

		u8 mcast_snooping = nla_get_u8(data[IFLA_BR_MCAST_SNOOPING]);



		err = br_multicast_toggle(br, mcast_snooping);

		if (err)

			return err;

		br_multicast_toggle(br, mcast_snooping);

	}



	if (data[IFLA_BR_MCAST_QUERY_USE_IFADDR]) {