Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-10-09 20:11:09 -07:00 · 2017-10-09 20:11:09 -07:00 · d93fa2ba64
commit d93fa2ba64
parent d0e60206be 529a86e063
184 changed files with 1414 additions and 1222 deletions
--- a/include/uapi/linux/netfilter/xt_bpf.h
+++ b/include/uapi/linux/netfilter/xt_bpf.h
@ -23,6 +23,7 @@ enum xt_bpf_modes {
 	XT_BPF_MODE_FD_PINNED,
 	XT_BPF_MODE_FD_ELF,
 };
+#define XT_BPF_MODE_PATH_PINNED XT_BPF_MODE_FD_PINNED

 struct xt_bpf_info_v1 {
 	__u16 mode;