diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-01 19:07:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-01 19:07:50 +0200 |
| commit | 29fda25a2d31098044f8dfa177c4d2834071828e (patch) | |
| tree | 9e4be11c49a4405c19ece8f81fbb1db478da1055 /samples | |
| parent | Merge branch 'revert-ipv6-const' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-29fda25a2d31098044f8dfa177c4d2834071828e.tar.xz linux-29fda25a2d31098044f8dfa177c4d2834071828e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two minor conflicts in virtio_net driver (bug fix overlapping addition
of a helper) and MAINTAINERS (new driver edit overlapping revamp of
PHY entry).
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/bpf/tcbpf2_kern.c | 4 | ||||
| -rwxr-xr-x | samples/bpf/test_tunnel_bpf.sh | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/samples/bpf/tcbpf2_kern.c b/samples/bpf/tcbpf2_kern.c index 9c823a609e75..270edcc149a1 100644 --- a/samples/bpf/tcbpf2_kern.c +++ b/samples/bpf/tcbpf2_kern.c @@ -147,9 +147,9 @@ int _geneve_set_tunnel(struct __sk_buff *skb) __builtin_memset(&gopt, 0x0, sizeof(gopt)); gopt.opt_class = 0x102; /* Open Virtual Networking (OVN) */ gopt.type = 0x08; - gopt.r1 = 1; + gopt.r1 = 0; gopt.r2 = 0; - gopt.r3 = 1; + gopt.r3 = 0; gopt.length = 2; /* 4-byte multiple */ *(int *) &gopt.opt_data = 0xdeadbeef; diff --git a/samples/bpf/test_tunnel_bpf.sh b/samples/bpf/test_tunnel_bpf.sh index 1ff634f187b7..a70d2ea90313 100755 --- a/samples/bpf/test_tunnel_bpf.sh +++ b/samples/bpf/test_tunnel_bpf.sh @@ -149,6 +149,7 @@ function cleanup { ip link del veth1 ip link del ipip11 ip link del gretap11 + ip link del vxlan11 ip link del geneve11 pkill tcpdump pkill cat |