diff options
| author | Jesper Dangaard Brouer | 2017-05-01 11:26:15 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-05-01 16:42:37 +0200 |
| commit | 6387d0111ca4740b69a082a92fc373185af11133 (patch) | |
| tree | ac6e2a31dc6650b92de059ce1c6261f7fd33a65a /samples/bpf/xdp_tx_iptunnel_user.c | |
| parent | Merge branch 'xdp-netlink-ext-ack' (diff) | |
| download | kernel-qcow2-linux-6387d0111ca4740b69a082a92fc373185af11133.tar.gz kernel-qcow2-linux-6387d0111ca4740b69a082a92fc373185af11133.tar.xz kernel-qcow2-linux-6387d0111ca4740b69a082a92fc373185af11133.zip | |
samples/bpf: fix SKB_MODE flag to be a 32-bit unsigned int
The kernel side of XDP_FLAGS_SKB_MODE is unsigned, and the rtnetlink
IFLA_XDP_FLAGS is defined as NLA_U32. Thus, userspace programs under
samples/bpf/ should use the correct type.
Fixes: 3993f2cb983b ("samples/bpf: Add support for SKB_MODE to xdp1 and xdp_tx_iptunnel")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples/bpf/xdp_tx_iptunnel_user.c')
| -rw-r--r-- | samples/bpf/xdp_tx_iptunnel_user.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/samples/bpf/xdp_tx_iptunnel_user.c b/samples/bpf/xdp_tx_iptunnel_user.c index cb2bda7b5346..880dd4aebfa4 100644 --- a/samples/bpf/xdp_tx_iptunnel_user.c +++ b/samples/bpf/xdp_tx_iptunnel_user.c @@ -142,8 +142,8 @@ int main(int argc, char **argv) struct iptnl_info tnl = {}; struct rlimit r = {RLIM_INFINITY, RLIM_INFINITY}; struct vip vip = {}; + __u32 xdp_flags = 0; char filename[256]; - int flags = 0; int opt; int i; @@ -204,7 +204,7 @@ int main(int argc, char **argv) kill_after_s = atoi(optarg); break; case 'S': - flags |= XDP_FLAGS_SKB_MODE; + xdp_flags |= XDP_FLAGS_SKB_MODE; break; default: usage(argv[0]); @@ -248,14 +248,14 @@ int main(int argc, char **argv) } } - if (set_link_xdp_fd(ifindex, prog_fd[0], flags) < 0) { + if (set_link_xdp_fd(ifindex, prog_fd[0], xdp_flags) < 0) { printf("link set xdp fd failed\n"); return 1; } poll_stats(kill_after_s); - set_link_xdp_fd(ifindex, -1, flags); + set_link_xdp_fd(ifindex, -1, xdp_flags); return 0; } |