Merge branch 'iptunnel-pkt-scrub-consolidate'
authorDavid S. Miller <davem@davemloft.net>
Thu, 18 Feb 2016 19:35:02 +0000 (14:35 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Feb 2016 19:35:02 +0000 (14:35 -0500)
commitf0a404505c7310ca1b59c49516360ca6baa5ef74
treef6c595f28145dc17d4dd983c0e0d64c19e1ebbfd
parent7c25b16dbbcf37ce8019bacf634ee47d852225d9
parent7f290c94352e59b1d720055fce760a69a63bd0a1
Merge branch 'iptunnel-pkt-scrub-consolidate'

Jiri Benc says:

====================
iptunnel: scrub packet in iptunnel_pull_header

As every IP tunnel has to scrub skb on decapsulation, iptunnel_pull_header
tried to do that and open coded part of skb_scrub_packet. Various tunneling
protocols (VXLAN, Geneve) then called full skb_scrub_packet on their own,
duplicating part of the scrubbing already done.

Consolidate the code, calling skb_scrub_packet from iptunnel_pull_header.
This will allow additional cleanups in VXLAN code, as the packet is scrubbed
early during rx processing after this patchset and VXLAN can start filling
out skb fields earlier.

The full picture of vxlan cleanup patches can be seen at:
https://github.com/jbenc/linux-vxlan/commits/master
====================

Signed-off-by: David S. Miller <davem@davemloft.net>