[SRU][B:linux-azure-4.15][PATCH 10/40] net: avoid including xdp.h in filter.h
William Breathitt Gray
william.gray at canonical.com
Mon Nov 2 12:48:26 UTC 2020
From: Jesper Dangaard Brouer <brouer at redhat.com>
BugLink: https://bugs.launchpad.net/bugs/1877654
If is sufficient with a forward declaration of struct xdp_rxq_info in
linux/filter.h, which avoids including net/xdp.h. This was originally
suggested by John Fastabend during the review phase, but wasn't
included in the final patchset revision. Thus, this followup.
Suggested-by: John Fastabend <john.fastabend at gmail.com>
Signed-off-by: Jesper Dangaard Brouer <brouer at redhat.com>
Signed-off-by: Alexei Starovoitov <ast at kernel.org>
(backported from commit 297dd12cb104151797fd649433a2157b585f1718)
[ vilhelmgray: context adjustment ]
Signed-off-by: William Breathitt Gray <william.gray at canonical.com>
---
include/linux/filter.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 158fb795cba7..449091818f43 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -19,7 +19,6 @@
#include <linux/cryptohash.h>
#include <linux/set_memory.h>
-#include <net/xdp.h>
#include <net/sch_generic.h>
#include <uapi/linux/filter.h>
@@ -29,6 +28,7 @@ struct sk_buff;
struct sock;
struct seccomp_data;
struct bpf_prog_aux;
+struct xdp_rxq_info;
/* ArgX, context and stack frame pointer register positions. Note,
* Arg1, Arg2, Arg3, etc are used as argument mappings of function
--
2.25.1
More information about the kernel-team
mailing list