flow_offload: Move rhashtable inclusion to the source file (c2b69f24) · Commits · 戴 / test

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: ("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>

include/net/flow_offload.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;

net/core/flow_offload.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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)
		{

net/sched/cls_api.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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>

Admin message