From: David S. Miller Date: Sun, 13 Nov 2016 04:38:08 +0000 (-0500) Subject: Merge branch 'fix-bpf_redirect' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=79774d6bfacb40699ecd5a343e5d4ac5a9cdd173;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'fix-bpf_redirect' Martin KaFai Lau says: ==================== bpf: Fix bpf_redirect to an ipip/ip6tnl dev This patch set fixes a bug in bpf_redirect(dev, flags) when dev is an ipip/ip6tnl. The current problem is IP-EthHdr-IP is sent out instead of IP-IP. Patch 1 adds a dev->type test similar to dev_is_mac_header_xmit() in act_mirred.c which is only available in net-next. We can consider to refactor it once this patch is pulled into net-next from net. ==================== Signed-off-by: David S. Miller --- 79774d6bfacb40699ecd5a343e5d4ac5a9cdd173