Merge tag 'powerpc-5.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux

[linux.git] / net / ipv6 / ip6mr.c

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index e4dd57976737a81549861c8ff5d9e9dcb7793a8d..e80d36c5073defc19565e53dddacf4856726f242 100644 (file)
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *     Linux IPv6 multicast routing support for BSD pim6sd
  *     Based on net/ipv4/ipmr.c.
@@ -8,12 +9,6 @@
  *             6WIND, Paris, France
  *     Copyright (C)2007,2008 USAGI/WIDE Project
  *             YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
- *
- *     This program is free software; you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License
- *     as published by the Free Software Foundation; either version
- *     2 of the License, or (at your option) any later version.
- *
  */
 
 #include <linux/uaccess.h>
@@ -355,7 +350,6 @@ static const struct rhashtable_params ip6mr_rht_params = {
        .key_offset = offsetof(struct mfc6_cache, cmparg),
        .key_len = sizeof(struct mfc6_cache_cmp_arg),
        .nelem_hint = 3,
-       .locks_mul = 1,
        .obj_cmpfn = ip6mr_hash_cmp,
        .automatic_shrinking = true,
 };