net: bridge: mark hash_elasticity as obsolete

Now that the bridge multicast uses the generic rhashtable interface we
can drop the hash_elasticity option as that is already done for us and
it's hardcoded to a maximum of RHT_ELASTICITY (16 currently). Add a
warning about the obsolete option when the hash_elasticity is set.

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 5b8cfef8bc4dd36e96eb36da0e0b4cecde8ca721..804ee15c45c197b9abc91e6d3d2e858568ce69b1 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1741,7 +1741,6 @@ static void br_ip6_multicast_query_expired(struct timer_list *t)
 
 void br_multicast_init(struct net_bridge *br)
 {
-       br->hash_elasticity = 4;
        br->hash_max = 512;
 
        br->multicast_router = MDB_RTR_TYPE_TEMP_QUERY;

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 063da636cb82e93665ae0b9ca48cee0a2d4c93a5..ff2c10d47529303cbc8ca5c3bbed3cb89771a5d8 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -1189,11 +1189,9 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
                        return err;
        }
 
-       if (data[IFLA_BR_MCAST_HASH_ELASTICITY]) {
-               u32 val = nla_get_u32(data[IFLA_BR_MCAST_HASH_ELASTICITY]);
-
-               br->hash_elasticity = val;
-       }
+       if (data[IFLA_BR_MCAST_HASH_ELASTICITY])
+               br_warn(br, "the hash_elasticity option has been deprecated and is always %u\n",
+                       RHT_ELASTICITY);
 
        if (data[IFLA_BR_MCAST_HASH_MAX])
                br->hash_max = nla_get_u32(data[IFLA_BR_MCAST_HASH_MAX]);
@@ -1452,8 +1450,7 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)
                       br_opt_get(br, BROPT_MULTICAST_QUERIER)) ||
            nla_put_u8(skb, IFLA_BR_MCAST_STATS_ENABLED,
                       br_opt_get(br, BROPT_MULTICAST_STATS_ENABLED)) ||
-           nla_put_u32(skb, IFLA_BR_MCAST_HASH_ELASTICITY,
-                       br->hash_elasticity) ||
+           nla_put_u32(skb, IFLA_BR_MCAST_HASH_ELASTICITY, RHT_ELASTICITY) ||
            nla_put_u32(skb, IFLA_BR_MCAST_HASH_MAX, br->hash_max) ||
            nla_put_u32(skb, IFLA_BR_MCAST_LAST_MEMBER_CNT,
                        br->multicast_last_member_count) ||

diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index cf1f7365deb36b09a93591eaae97df9b8640fa2f..ba50fa437a9406d857049e2ec6671ca24f4b416c 100644 (file)
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -372,7 +372,6 @@ struct net_bridge {
 
 #ifdef CONFIG_BRIDGE_IGMP_SNOOPING
 
-       u32                             hash_elasticity;
        u32                             hash_max;
 
        u32                             multicast_last_member_count;

diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
index f164cda30fe2d23b367c75f872ca256a8c155406..b05b94e9c595f0583f0c5b9cfb5983948d4be201 100644 (file)
--- a/net/bridge/br_sysfs_br.c
+++ b/net/bridge/br_sysfs_br.c
@@ -424,13 +424,13 @@ static DEVICE_ATTR_RW(multicast_querier);
 static ssize_t hash_elasticity_show(struct device *d,
                                    struct device_attribute *attr, char *buf)
 {
-       struct net_bridge *br = to_bridge(d);
-       return sprintf(buf, "%u\n", br->hash_elasticity);
+       return sprintf(buf, "%u\n", RHT_ELASTICITY);
 }
 
 static int set_elasticity(struct net_bridge *br, unsigned long val)
 {
-       br->hash_elasticity = val;
+       br_warn(br, "the hash_elasticity option has been deprecated and is always %u\n",
+               RHT_ELASTICITY);
        return 0;
 }