summaryrefslogtreecommitdiffstats
path: root/net/ipv4/inet_fragment.c
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@redhat.com>2014-08-01 12:29:47 +0200
committerDavid S. Miller <davem@davemloft.net>2014-08-02 15:31:31 -0700
commit2e404f632f44979ddf0ce0808a438249a72d7015 (patch)
treead03dac0a0596292475d7ac25b99c79a3499ee0d /net/ipv4/inet_fragment.c
parentf926e23660d52601089222cb4755aabc693ca390 (diff)
downloadop-kernel-dev-2e404f632f44979ddf0ce0808a438249a72d7015.zip
op-kernel-dev-2e404f632f44979ddf0ce0808a438249a72d7015.tar.gz
inet: frags: use INET_FRAG_EVICTED to prevent icmp messages
Now that we have INET_FRAG_EVICTED we might as well use it to stop sending icmp messages in the "frag_expire" functions instead of stripping INET_FRAG_FIRST_IN from their flags when evicting. Also fix the comment style in ip6_expire_frag_queue(). Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com> Reviewed-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_fragment.c')
-rw-r--r--net/ipv4/inet_fragment.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c
index fa49916..4baa76c 100644
--- a/net/ipv4/inet_fragment.c
+++ b/net/ipv4/inet_fragment.c
@@ -151,8 +151,6 @@ evict_again:
goto evict_again;
}
- /* suppress xmit of (icmp) error packet */
- fq->flags &= ~INET_FRAG_FIRST_IN;
fq->flags |= INET_FRAG_EVICTED;
hlist_del(&fq->list);
hlist_add_head(&fq->list, &expired);
OpenPOWER on IntegriCloud