From: David S. Miller Date: Thu, 18 Feb 2016 19:35:02 +0000 (-0500) Subject: Merge branch 'iptunnel-pkt-scrub-consolidate' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f0a404505c7310ca1b59c49516360ca6baa5ef74;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 --- f0a404505c7310ca1b59c49516360ca6baa5ef74