diff options
| author |   Florian Westphal <fw@strlen.de> | 2014-07-24 16:50:31 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-07-27 22:34:35 -0700 |
| commit | 86e93e470cadedda9181a2bd9aee1d9d2e5e9c0f (patch) | |
| tree | adf79021d31261d4ad11c0cbc72ff33cf1e83902 /net/ipv4/ip_fragment.c | |
| parent | inet: frag: remove hash size assumptions from callers (diff) | |
| download | linux-dev-86e93e470cadedda9181a2bd9aee1d9d2e5e9c0f.tar.xz linux-dev-86e93e470cadedda9181a2bd9aee1d9d2e5e9c0f.zip | |
inet: frag: move evictor calls into frag_find function
First step to move eviction handling into a work queue.
We lose two spots that accounted evicted fragments in MIB counters.
Accounting will be restored since the upcoming work-queue evictor
invokes the frag queue timer callbacks instead.
Signed-off-by: Florian Westphal <fw@strlen.de>
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 | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index b769eb6c83c0..54988672d00d 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -177,18 +177,6 @@ static void ipq_kill(struct ipq *ipq) inet_frag_kill(&ipq->q, &ip4_frags); } -/* Memory limiting on fragments. Evictor trashes the oldest - * fragment queue until we are back under the threshold. - */ -static void ip_evictor(struct net *net) -{ - int evicted; - - evicted = inet_frag_evictor(&net->ipv4.frags, &ip4_frags, false); - if (evicted) - IP_ADD_STATS_BH(net, IPSTATS_MIB_REASMFAILS, evicted); -} - /* * Oops, a fragment queue timed out. Kill it and send an ICMP reply. */ @@ -655,9 +643,6 @@ int ip_defrag(struct sk_buff *skb, u32 user) net = skb->dev ? dev_net(skb->dev) : dev_net(skb_dst(skb)->dev); IP_INC_STATS_BH(net, IPSTATS_MIB_REASMREQDS); - /* Start by cleaning up the memory. */ - ip_evictor(net); - /* Lookup (or create) queue header */ if ((qp = ip_find(net, ip_hdr(skb), user)) != NULL) { int ret; |