diff options
| author | Amerigo Wang <amwang@redhat.com> | 2012-09-18 18:50:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-19 23:23:28 +0200 |
| commit | 6b102865e7ba9ff1e3c49c32c7187bb427d91798 (patch) | |
| tree | 21a7f917457ab79f40d5bd579e547a030b2f0610 /net/ipv4/ip_fragment.c | |
| parent | ipv6: make ip6_frag_nqueues() and ip6_frag_mem() static inline (diff) | |
| download | linux-6b102865e7ba9ff1e3c49c32c7187bb427d91798.tar.xz linux-6b102865e7ba9ff1e3c49c32c7187bb427d91798.zip | |
ipv6: unify fragment thresh handling code
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Michal Kubeček <mkubecek@suse.cz>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_fragment.c')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index fa6a12c51066..448e68546827 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -219,7 +219,7 @@ static void ip_evictor(struct net *net) { int evicted; - evicted = inet_frag_evictor(&net->ipv4.frags, &ip4_frags); + evicted = inet_frag_evictor(&net->ipv4.frags, &ip4_frags, false); if (evicted) IP_ADD_STATS_BH(net, IPSTATS_MIB_REASMFAILS, evicted); } @@ -684,8 +684,7 @@ int ip_defrag(struct sk_buff *skb, u32 user) IP_INC_STATS_BH(net, IPSTATS_MIB_REASMREQDS); /* Start by cleaning up the memory. */ - if (atomic_read(&net->ipv4.frags.mem) > net->ipv4.frags.high_thresh) - ip_evictor(net); + ip_evictor(net); /* Lookup (or create) queue header */ if ((qp = ip_find(net, ip_hdr(skb), user)) != NULL) { |