samples/bpf: fix bpf tunnel cleanup

test_tunnel_bpf.sh fails to remove the vxlan11 tunnel device, causing the
next geneve tunnelling test case fails.  In addition, the geneve reserved bit
in tcbpf2_kern.c should be zero, according to the RFC.

Signed-off-by: William Tu <u9012063@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
William Tu 2017-07-31 14:40:50 -07:00 committed by David S. Miller
parent cb891fa6a1
commit cc75f8514d
2 changed files with 3 additions and 2 deletions

View file

@ -147,9 +147,9 @@ int _geneve_set_tunnel(struct __sk_buff *skb)
__builtin_memset(&gopt, 0x0, sizeof(gopt)); __builtin_memset(&gopt, 0x0, sizeof(gopt));
gopt.opt_class = 0x102; /* Open Virtual Networking (OVN) */ gopt.opt_class = 0x102; /* Open Virtual Networking (OVN) */
gopt.type = 0x08; gopt.type = 0x08;
gopt.r1 = 1; gopt.r1 = 0;
gopt.r2 = 0; gopt.r2 = 0;
gopt.r3 = 1; gopt.r3 = 0;
gopt.length = 2; /* 4-byte multiple */ gopt.length = 2; /* 4-byte multiple */
*(int *) &gopt.opt_data = 0xdeadbeef; *(int *) &gopt.opt_data = 0xdeadbeef;

View file

@ -149,6 +149,7 @@ function cleanup {
ip link del veth1 ip link del veth1
ip link del ipip11 ip link del ipip11
ip link del gretap11 ip link del gretap11
ip link del vxlan11
ip link del geneve11 ip link del geneve11
pkill tcpdump pkill tcpdump
pkill cat pkill cat