Merge branch 'gre-add-collect_md-mode-for-ERSPAN-tunnel'

Browse source

William Tu says:

====================
gre: add collect_md mode for ERSPAN tunnel

This patch series provide collect_md mode for ERSPAN tunnel.  The fist patch
refactors the existing gre_fb_xmit function by exacting the route cache
portion into a new function called prepare_fb_xmit.  The second patch
introduces the collect_md mode for ERSPAN tunnel, by calling the
prepare_fb_xmit function and adding ERSPAN specific logic.  The final patch
adds the test case using bpf_skb_{set,get}_tunnel_{key,opt}.
====================

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

...

This commit is contained in:

David S. Miller 2017-08-28 15:04:52 -07:00

parent 03157937fe ef88f89c83

commit d5a915b978

4 changed files with 232 additions and 21 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

include/net/ip_tunnels.h

View file

157

net/ipv4/ip_gre.c

View file

63

samples/bpf/tcbpf2_kern.c

View file

29

samples/bpf/test_tunnel_bpf.sh

View file