From: David S. Miller Date: Mon, 7 Aug 2017 03:51:12 +0000 (-0700) Subject: Merge branch 'IP-cleanup-LSRR-option-processing' X-Git-Tag: android-x86-8.1-r1~2763^2~370 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=21e27f2d8652522ca0ef35918e8d24b329149a73;p=android-x86%2Fkernel.git Merge branch 'IP-cleanup-LSRR-option-processing' Paolo Abeni says: ==================== IP: cleanup LSRR option processing The __ip_options_echo() function expect a valid dst entry in skb->dst; as result we sometimes need to preserve the dst entry for the whole IP RX path. The current usage of skb->dst looks more a relic from ancient past that a real functional constraint. This patchset tries to remove such usage, and than drops some hacks currently in place in the IP code to keep skb->dst around. __ip_options_echo() uses of skb->dst for two different purposes: retrieving the netns assicated with the skb, and modify the ingress packet LSRR address list. The first patch removes the code modifying the ingress packet, and the second one provides an explicit netns argument to __ip_options_echo(). The following patches cleanup the current code keeping arund skb->dst for __ip_options_echo's sake. Updating the __ip_options_echo() function has been previously discussed here: http://marc.info/?l=linux-netdev&m=150064533516348&w=2 ==================== Signed-off-by: David S. Miller --- 21e27f2d8652522ca0ef35918e8d24b329149a73