summaryrefslogtreecommitdiff
path: root/net/bridge
diff options
context:
space:
mode:
authorThomas Graf <tgraf@suug.ch>2012-07-10 22:29:19 +0000
committerDavid S. Miller <davem@davemloft.net>2012-07-16 22:59:30 -0700
commit036be6dbcfbe3da14be9b3463b94a5f79d8a2d71 (patch)
tree6de042db9c434574e4d23a3a440001ab95df2b27 /net/bridge
parent9c64508af2c171f57a198729c59a7a6f6998b3a1 (diff)
downloadlinux-3.10-036be6dbcfbe3da14be9b3463b94a5f79d8a2d71.tar.gz
linux-3.10-036be6dbcfbe3da14be9b3463b94a5f79d8a2d71.tar.bz2
linux-3.10-036be6dbcfbe3da14be9b3463b94a5f79d8a2d71.zip
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>
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_multicast.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 2d9a0663b84..241743417f4 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -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;