]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'fix-bpf_redirect'
authorDavid S. Miller <davem@davemloft.net>
Sun, 13 Nov 2016 04:38:08 +0000 (23:38 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 13 Nov 2016 04:38:08 +0000 (23:38 -0500)
commit79774d6bfacb40699ecd5a343e5d4ac5a9cdd173
tree5732e718ec730c9da67ad4521dca5bfd2068c2d0
parent23dd8315485acae0acf4452509e2be9fc587d72c
parent90e02896f1a4627b14624245fbcbc19f8fd916cb
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 <davem@davemloft.net>