summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2019-05-24 19:03:37 +0300
committerDavid S. Miller <davem@davemloft.net>2019-05-27 00:08:05 +0300
commit9cce45f22ceedf639cbb5fb5dfe612a278d36b58 (patch)
treeb9f3fddc97b7a63477495f384c62cb996e6754f2
parentd2dfd43598f3ce5441daabc7b352cdfea811e021 (diff)
downloadlinux-9cce45f22ceedf639cbb5fb5dfe612a278d36b58.tar.xz
net: rename inet_frags_init_net() to fdir_init()
And pass an extra parameter, since we will soon dynamically allocate fqdir structures. Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/inet_frag.h3
-rw-r--r--net/ieee802154/6lowpan/reassembly.c3
-rw-r--r--net/ipv4/ip_fragment.c3
-rw-r--r--net/ipv6/netfilter/nf_conntrack_reasm.c3
-rw-r--r--net/ipv6/reassembly.c3
5 files changed, 6 insertions, 9 deletions
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index d1bfd5dbe2d4..fca246b0abd8 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -104,8 +104,9 @@ struct inet_frags {
int inet_frags_init(struct inet_frags *);
void inet_frags_fini(struct inet_frags *);
-static inline int inet_frags_init_net(struct fqdir *fqdir)
+static inline int fqdir_init(struct fqdir *fqdir, struct inet_frags *f)
{
+ fqdir->f = f;
atomic_long_set(&fqdir->mem, 0);
return rhashtable_init(&fqdir->rhashtable, &fqdir->f->rhash_params);
}
diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
index 4bbd6999c58f..82db76ce0e61 100644
--- a/net/ieee802154/6lowpan/reassembly.c
+++ b/net/ieee802154/6lowpan/reassembly.c
@@ -452,9 +452,8 @@ static int __net_init lowpan_frags_init_net(struct net *net)
ieee802154_lowpan->fqdir.high_thresh = IPV6_FRAG_HIGH_THRESH;
ieee802154_lowpan->fqdir.low_thresh = IPV6_FRAG_LOW_THRESH;
ieee802154_lowpan->fqdir.timeout = IPV6_FRAG_TIMEOUT;
- ieee802154_lowpan->fqdir.f = &lowpan_frags;
- res = inet_frags_init_net(&ieee802154_lowpan->fqdir);
+ res = fqdir_init(&ieee802154_lowpan->fqdir, &lowpan_frags);
if (res < 0)
return res;
res = lowpan_frags_ns_sysctl_register(net);
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index fb035f4f36ca..d95592d52981 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -672,9 +672,8 @@ static int __net_init ipv4_frags_init_net(struct net *net)
net->ipv4.fqdir.timeout = IP_FRAG_TIME;
net->ipv4.fqdir.max_dist = 64;
- net->ipv4.fqdir.f = &ip4_frags;
- res = inet_frags_init_net(&net->ipv4.fqdir);
+ res = fqdir_init(&net->ipv4.fqdir, &ip4_frags);
if (res < 0)
return res;
res = ip4_frags_ns_ctl_register(net);
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 3387ce530409..e72a1cc42163 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -494,9 +494,8 @@ static int nf_ct_net_init(struct net *net)
net->nf_frag.fqdir.high_thresh = IPV6_FRAG_HIGH_THRESH;
net->nf_frag.fqdir.low_thresh = IPV6_FRAG_LOW_THRESH;
net->nf_frag.fqdir.timeout = IPV6_FRAG_TIMEOUT;
- net->nf_frag.fqdir.f = &nf_frags;
- res = inet_frags_init_net(&net->nf_frag.fqdir);
+ res = fqdir_init(&net->nf_frag.fqdir, &nf_frags);
if (res < 0)
return res;
res = nf_ct_frag6_sysctl_register(net);
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index aabc9b2e83e4..8235c5a8e8fe 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -515,9 +515,8 @@ static int __net_init ipv6_frags_init_net(struct net *net)
net->ipv6.fqdir.high_thresh = IPV6_FRAG_HIGH_THRESH;
net->ipv6.fqdir.low_thresh = IPV6_FRAG_LOW_THRESH;
net->ipv6.fqdir.timeout = IPV6_FRAG_TIMEOUT;
- net->ipv6.fqdir.f = &ip6_frags;
- res = inet_frags_init_net(&net->ipv6.fqdir);
+ res = fqdir_init(&net->ipv6.fqdir, &ip6_frags);
if (res < 0)
return res;