diff options
| author |   Nikolay Aleksandrov <nikolay@cumulusnetworks.com> | 2018-12-05 15:14:26 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-12-05 17:01:51 -0800 |
| commit | cf332bca56f4981cad19027f037fb4d661dcb172 (patch) | |
| tree | 5ef439caa2d1a9cbfa33fa6dad356487f92c49b2 /net/bridge/br_sysfs_br.c | |
| parent | net: bridge: multicast: use non-bh rcu flavor (diff) | |
| download | linux-dev-cf332bca56f4981cad19027f037fb4d661dcb172.tar.xz linux-dev-cf332bca56f4981cad19027f037fb4d661dcb172.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | net/bridge/br_sysfs_br.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index f164cda30fe2..b05b94e9c595 100644 --- 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; } |