diff options
| author |   Eric Dumazet <edumazet@google.com> | 2019-05-24 09:03:30 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-05-26 14:08:04 -0700 |
| commit | 6ce3b4dcee4f96a5000d3f790403eb6997e3d553 (patch) | |
| tree | 8247968b50fc5a8b54c647b67a3136d03a8fc0e7 /net/ipv6/netfilter | |
| parent | net: phy: tja11xx: Add TJA11xx PHY driver (diff) | |
| download | linux-dev-6ce3b4dcee4f96a5000d3f790403eb6997e3d553.tar.xz linux-dev-6ce3b4dcee4f96a5000d3f790403eb6997e3d553.zip | |
inet: rename netns_frags to fqdir
1) struct netns_frags is renamed to struct fqdir
This structure is really holding many frag queues in a hash table.
2) (struct inet_frag_queue)->net field is renamed to fqdir
since net is generally associated to a 'struct net' pointer
in networking stack.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/netfilter')
| -rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c index 3de0e9b0a482..5b877d732b2f 100644 --- a/net/ipv6/netfilter/nf_conntrack_reasm.c +++ b/net/ipv6/netfilter/nf_conntrack_reasm.c @@ -151,7 +151,7 @@ static void nf_ct_frag6_expire(struct timer_list *t) struct net *net; fq = container_of(frag, struct frag_queue, q); - net = container_of(fq->q.net, struct net, nf_frag.frags); + net = container_of(fq->q.fqdir, struct net, nf_frag.frags); ip6frag_expire_frag_queue(net, fq); } @@ -276,7 +276,7 @@ static int nf_ct_frag6_queue(struct frag_queue *fq, struct sk_buff *skb, fq->ecn |= ecn; if (payload_len > fq->q.max_size) fq->q.max_size = payload_len; - add_frag_mem_limit(fq->q.net, skb->truesize); + add_frag_mem_limit(fq->q.fqdir, skb->truesize); /* The first fragment. * nhoffset is obtained from the first fragment, of course. |