]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "ipv4: use skb coalescing in defragmentation"
authorFlorian Westphal <fw@strlen.de>
Fri, 10 Jul 2015 23:37:36 +0000 (01:37 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 12 Jul 2015 04:16:40 +0000 (21:16 -0700)
commit0a3d442293c50e87109d769b43c3c321173eff8f
treec9fa909b52048146d24a0200ef1fac2d9b145140
parent9cbde101365b21e8c9d5d44565ccf3cdcdcd5e18
Revert "ipv4: use skb coalescing in defragmentation"

This reverts commit 317cafac5c433d5f71275da01964998ccb754fac.

There is nothing wrong with coalescing during defragmentation, it
reduces truesize overhead and simplifies things for the receiving
socket (no fraglist walk needed).

However, it also destroys geometry of the original fragments.
While that doesn't cause any breakage (we make sure to not exceed largest
original size) ip_do_fragment contains a 'fastpath' that takes advantage
of a present frag list and results in fragments that (in most cases)
match what was received.

In case its needed the coalescing could be done later, when we're sure
the skb is not forwarded.  But discussion during NFWS resulted in
'lets just remove this for now'.

Cc: Eric Dumazet <edumazet@google.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/ip_fragment.c