aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2019-11-12 00:29:52 +0100
committerDavid S. Miller <davem@davemloft.net>2019-11-12 19:42:26 -0800
commit9f48e9bf253aa292dbf10f173f6f4c02d0349f45 (patch)
treecc5a24cf7b2fd4026734d60bcfb4ab63ae1f15c9 /include/net
parentnetfilter: nf_flow_table: move conntrack object to struct flow_offload (diff)
downloadlinux-dev-9f48e9bf253aa292dbf10f173f6f4c02d0349f45.tar.xz
linux-dev-9f48e9bf253aa292dbf10f173f6f4c02d0349f45.zip
netfilter: nf_flow_table: remove union from flow_offload structure
Drivers do not have access to the flow_offload structure, hence remove this union from this flow_offload object as well as the original comment on top of it. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/nf_flow_table.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h
index 88c8cd248213..7f892d6c1a6d 100644
--- a/include/net/netfilter/nf_flow_table.h
+++ b/include/net/netfilter/nf_flow_table.h
@@ -74,10 +74,7 @@ struct flow_offload {
struct flow_offload_tuple_rhash tuplehash[FLOW_OFFLOAD_DIR_MAX];
struct nf_conn *ct;
u32 flags;
- union {
- /* Your private driver data here. */
- u32 timeout;
- };
+ u32 timeout;
};
#define NF_FLOW_TIMEOUT (30 * HZ)