diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2020-07-24 10:50:22 +1000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-24 15:17:22 -0700 |
| commit | c2b69f24ebd166a13cdc9909b50f33228895998b (patch) | |
| tree | cf7041794d682fb5077313fc1cc325be30d875a2 | |
| parent | 8e8135862ccb5082347e2137b8a33edaf51427ce (diff) | |
| download | linux-c2b69f24ebd166a13cdc9909b50f33228895998b.tar.bz2 | |
flow_offload: Move rhashtable inclusion to the source file
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/flow_offload.h | 1 | ||||
| -rw-r--r-- | net/core/flow_offload.c | 1 | ||||
| -rw-r--r-- | net/sched/cls_api.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h index 6315324b9dc2..3eaf25f68b79 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 b739cfab796e..2076219b8ba5 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 e62beec0d844..4619cb3cb0a8 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> |