net: bridge: increase multicast's default maximum number of entries

bridge's default hash_max was 512 which is rather conservative, now that
we're using the generic rhashtable API which autoshrinks let's increase
it to 4096 and move it to a define in br_private.h.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 804ee15c45c197b9abc91e6d3d2e858568ce69b1..879cd2315769930bdaf71a9faa9fd63fe87d1380 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1741,7 +1741,7 @@ static void br_ip6_multicast_query_expired(struct timer_list *t)
 
 void br_multicast_init(struct net_bridge *br)
 {
-       br->hash_max = 512;
+       br->hash_max = BR_MULTICAST_DEFAULT_HASH_MAX;
 
        br->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;
        br->multicast_last_member_count = 2;

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index ba50fa437a9406d857049e2ec6671ca24f4b416c..5719b4d3e4668a9cbe29eaee856de930e6795bca 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -31,6 +31,8 @@
 #define BR_PORT_BITS   10
 #define BR_MAX_PORTS   (1<<BR_PORT_BITS)
 
+#define BR_MULTICAST_DEFAULT_HASH_MAX 4096
+
 #define BR_VERSION     "2.3"
 
 /* Control of forwarding link local multicast */