| From foo@baz Mon Sep 17 13:33:56 CEST 2018 |
| From: Stephen Hemminger <stephen@networkplumber.org> |
| Date: Thu, 13 Sep 2018 07:58:35 -0700 |
| Subject: inet: frags: refactor ipfrag_init() |
| To: davem@davemloft.net, gregkh@linuxfoundation.org |
| Cc: netdev@vger.kernel.org, stable@vger.kernel.org, edumazet@google.com |
| Message-ID: <20180913145902.17531-4-sthemmin@microsoft.com> |
| |
| From: Eric Dumazet <edumazet@google.com> |
| |
| We need to call inet_frags_init() before register_pernet_subsys(), |
| as a prereq for following patch ("inet: frags: use rhashtables for reassembly units") |
| |
| Signed-off-by: Eric Dumazet <edumazet@google.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 483a6e4fa055123142d8956866fe2aa9c98d546d) |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/ipv4/ip_fragment.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/net/ipv4/ip_fragment.c |
| +++ b/net/ipv4/ip_fragment.c |
| @@ -900,8 +900,6 @@ static struct pernet_operations ip4_frag |
| |
| void __init ipfrag_init(void) |
| { |
| - ip4_frags_ctl_register(); |
| - register_pernet_subsys(&ip4_frags_ops); |
| ip4_frags.hashfn = ip4_hashfn; |
| ip4_frags.constructor = ip4_frag_init; |
| ip4_frags.destructor = ip4_frag_free; |
| @@ -911,4 +909,6 @@ void __init ipfrag_init(void) |
| ip4_frags.frags_cache_name = ip_frag_cache_name; |
| if (inet_frags_init(&ip4_frags)) |
| panic("IP: failed to allocate ip4_frags cache\n"); |
| + ip4_frags_ctl_register(); |
| + register_pernet_subsys(&ip4_frags_ops); |
| } |
