diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-27 12:42:15 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-07-27 12:42:15 +0200 |
commit | 908e757daecf2120c3019fa630ae5d4c3cd7165b (patch) | |
tree | 652b0f3ecd4a6d7c0066169d6ae466711300197c /net/core/flow_offload.c | |
parent | staging: comedi: addi: Replace HTTP links with HTTPS ones (diff) | |
parent | Linux 5.8-rc7 (diff) | |
download | linux-dev-908e757daecf2120c3019fa630ae5d4c3cd7165b.tar.xz linux-dev-908e757daecf2120c3019fa630ae5d4c3cd7165b.zip |
Merge 5.8-rc7 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core/flow_offload.c')
-rw-r--r-- | net/core/flow_offload.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) { |