Commit 036be6db authored Jul 10, 2012 by Thomas Graf Committed by David S. Miller Jul 16, 2012

bridge: Fix enforcement of multicast hash_max limit



The hash size is doubled when it needs to grow and compared against
hash_max. The >= comparison will limit the hash table size to half
of what is expected i.e. the default 512 hash_max will not allow
the hash table to grow larger than 256.

Also print the hash table limit instead of the desirable size when
the limit is reached.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9c64508a

net/bridge/br_multicast.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -540,10 +540,11 @@ static struct net_bridge_mdb_entry *br_multicast_get_group(

		if (mdb->size >= max) {
		max *= 2;
		if (unlikely(max >= br->hash_max)) {
		br_warn(br, "Multicast hash table maximum "
		"reached, disabling snooping: %s, %d\n",
		port ? port->dev->name : br->dev->name, max);
		if (unlikely(max > br->hash_max)) {
		br_warn(br, "Multicast hash table maximum of %d "
		"reached, disabling snooping: %s\n",
		br->hash_max,
		port ? port->dev->name : br->dev->name);
		err = -E2BIG;
		disable:
		br->multicast_disabled = 1;