Commit d1942cd4 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

bridge: mcast: Simplify MDB entry creation 



Before creating a new MDB entry, br_multicast_new_group() will call
br_mdb_ip_get() to see if one exists and return it if so.

Therefore, simply call br_multicast_new_group() and omit the call to
br_mdb_ip_get().

Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Acked-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 262985fa

net/bridge/br_mdb.c

+3 −8
Original line number Diff line number Diff line
@@ -866,7 +866,6 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port, 
	unsigned long now = jiffies;

	unsigned char flags = 0;

	u8 filter_mode;

	int err;



	__mdb_entry_to_br_ip(entry, &group, mdb_attrs);
@@ -892,13 +891,9 @@ static int br_mdb_add_group(struct net_bridge *br, struct net_bridge_port *port, 
		return -EINVAL;

	}



	mp = br_mdb_ip_get(br, &group);

	if (!mp) {

	mp = br_multicast_new_group(br, &group);

		err = PTR_ERR_OR_ZERO(mp);

		if (err)

			return err;

	}

	if (IS_ERR(mp))

		return PTR_ERR(mp);



	/* host join */

	if (!port) {