| Message ID | 20200724005022.GA29161@gondor.apana.org.au |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | flow_offload: Move rhashtable inclusion to the source file | expand |
From: Herbert Xu <herbert@gondor.apana.org.au> Date: Fri, 24 Jul 2020 10:50:22 +1000 > I noticed that touching linux/rhashtable.h causes lib/vsprintf.c to > be rebuilt. This dependency came through a bogus inclusion in the > file net/flow_offload.h. This patch moves it to the right place. > > This patch also removes a lingering rhashtable inclusion in cls_api > created by the same commit. > > Fixes: 4e481908c51b ("flow_offload: move tc indirect block to...") > Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Applied, thanks.
diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h index f2c8311a0433..1075369d21d3 100644 --- a/include/net/flow_offload.h +++ b/include/net/flow_offload.h @@ -5,7 +5,6 @@ #include <linux/list.h> #include <linux/netlink.h> #include <net/flow_dissector.h> -#include <linux/rhashtable.h> struct flow_match { struct flow_dissector *dissector; diff --git a/net/core/flow_offload.c b/net/core/flow_offload.c index 0cfc35e6be28..e88320c17665 100644 --- a/net/core/flow_offload.c +++ b/net/core/flow_offload.c @@ -4,6 +4,7 @@ #include <net/flow_offload.h> #include <linux/rtnetlink.h> #include <linux/mutex.h> +#include <linux/rhashtable.h> struct flow_rule *flow_rule_alloc(unsigned int num_actions) { diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index a00a203b2ef5..caa254ece49f 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@ -20,7 +20,6 @@ #include <linux/kmod.h> #include <linux/slab.h> #include <linux/idr.h> -#include <linux/rhashtable.h> #include <linux/jhash.h> #include <linux/rculist.h> #include <net/net_namespace.h>
I noticed that touching linux/rhashtable.h causes lib/vsprintf.c to be rebuilt. This dependency came through a bogus inclusion in the file net/flow_offload.h. This patch moves it to the right place. This patch also removes a lingering rhashtable inclusion in cls_api created by the same commit. Fixes: 4e481908c51b ("flow_offload: move tc indirect block to...") Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>