Merge pull request #1443 from iovisor/yhs_dev

use user-provided log_level in bpf_prog_load

Merge pull request #1443 from iovisor/yhs_dev
use user-provided log_level in bpf_prog_load
0342ef50 · 4ast · GitHub · 5e86c133 · e86b017e · 0342ef50
Commit 0342ef50 authored Nov 16, 2017 by 4ast Committed by GitHub Nov 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

src/cc/libbpf.c src/cc/libbpf.c +2 -1

No files found.
--- a/src/cc/libbpf.c
+++ b/src/cc/libbpf.c
@@ -448,7 +448,8 @@ int bpf_prog_load(enum bpf_prog_type prog_type, const char *name,
    if (tmp_log_buf)
      free(tmp_log_buf);
    tmp_log_buf_size = LOG_BUF_SIZE;
-    attr.log_level = 1;
+    if (attr.log_level == 0)
+      attr.log_level = 1;
    for (;;) {
      tmp_log_buf = malloc(tmp_log_buf_size);
      if (!tmp_log_buf) {