Merge tag 'io_uring-5.6-2020-02-14' of git://git.kernel.dk/linux-block

[linux.git] / samples / bpf / xdp_adjust_tail_user.c

diff --git a/samples/bpf/xdp_adjust_tail_user.c b/samples/bpf/xdp_adjust_tail_user.c
index d86e9ad0356bd60131ab49359968412d603a5a25..ba482dc3da3368e83e7fa10c30ff4e5ab7cc0fa7 100644 (file)
--- a/samples/bpf/xdp_adjust_tail_user.c
+++ b/samples/bpf/xdp_adjust_tail_user.c
@@ -19,8 +19,8 @@
 #include <netinet/ether.h>
 #include <unistd.h>
 #include <time.h>
-#include "bpf.h"
-#include "libbpf.h"
+#include <bpf/bpf.h>
+#include <bpf/libbpf.h>
 
 #define STATS_INTERVAL_S 2U
 #define MAX_PCKT_SIZE 600
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
                        xdp_flags |= XDP_FLAGS_SKB_MODE;
                        break;
                case 'N':
-                       xdp_flags |= XDP_FLAGS_DRV_MODE;
+                       /* default, set below */
                        break;
                case 'F':
                        xdp_flags &= ~XDP_FLAGS_UPDATE_IF_NOEXIST;
@@ -132,6 +132,9 @@ int main(int argc, char **argv)
                opt_flags[opt] = 0;
        }
 
+       if (!(xdp_flags & XDP_FLAGS_SKB_MODE))
+               xdp_flags |= XDP_FLAGS_DRV_MODE;
+
        for (i = 0; i < strlen(optstr); i++) {
                if (opt_flags[(unsigned int)optstr[i]]) {
                        fprintf(stderr, "Missing argument -%c\n", optstr[i]);