OSDN Git Service

Revert "sit: reload iphdr in ipip6_rcv"
authorDavid S. Miller <davem@davemloft.net>
Tue, 6 Jun 2017 15:34:06 +0000 (11:34 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Jul 2018 12:25:52 +0000 (14:25 +0200)
commit0b12830665116f90ed795a1a54e2fced083c1a59
treef64bd8c03e995bf2ff1241bb53385ec5fee59675
parentf15fa075cdff3a5c7321d4fa6f3d733d28ff46e0
Revert "sit: reload iphdr in ipip6_rcv"

commit f4eb17e1efe538d4da7d574bedb00a8dafcc26b7 upstream.

This reverts commit b699d0035836f6712917a41e7ae58d84359b8ff9.

As per Eric Dumazet, the pskb_may_pull() is a NOP in this
particular case, so the 'iph' reload is unnecessary.

Signed-off-by: David S. Miller <davem@davemloft.net>
Cc: Dmitry Tunin <hanipouspilot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv6/sit.c