Commit e443f41e authored by Daniel Borkmann's avatar Daniel Borkmann Committed by Greg Kroah-Hartman

bpf: pull in pkt_sched.h header for tooling to fix bpftool build

[ Upstream commit ad6dd7a9 ]

Dan reported that bpftool does not compile for him:

  $ make tools/bpf
    DESCEND  bpf

  Auto-detecting system features:
  ..                        libbfd: [ on  ]
  ..        disassembler-four-args: [ OFF ]

    DESCEND  bpftool

  Auto-detecting system features:
  ..                        libbfd: [ on  ]
  ..        disassembler-four-args: [ OFF ]

    CC       /opt/linux.git/tools/bpf/bpftool/net.o
  In file included from /opt/linux.git/tools/include/uapi/linux/pkt_cls.h:6:0,
                 from /opt/linux.git/tools/include/uapi/linux/tc_act/tc_bpf.h:14,
                 from net.c:13:
  net.c: In function 'show_dev_tc_bpf':
  net.c:164:21: error: 'TC_H_CLSACT' undeclared (first use in this function)
    handle = TC_H_MAKE(TC_H_CLSACT, TC_H_MIN_INGRESS);
  [...]

Fix it by importing pkt_sched.h header copy into tooling
infrastructure.

Fixes: 49a249c3 ("tools/bpftool: copy a few net uapi headers to tools directory")
Fixes: f6f3bac0 ("tools/bpf: bpftool: add net support")
Reported-by: 's avatarDan Gilson <dan_gilson@yahoo.com>
Reference: https://bugzilla.kernel.org/show_bug.cgi?id=202315Signed-off-by: 's avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: 's avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: 's avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: 's avatarSasha Levin <sashal@kernel.org>
parent 2db7aeef
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment