]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
netfilter: nf_flow_table: remove union from flow_offload structure
authorPablo Neira Ayuso <pablo@netfilter.org>
Mon, 11 Nov 2019 23:29:52 +0000 (00:29 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Nov 2019 03:42:26 +0000 (19:42 -0800)
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>
include/net/netfilter/nf_flow_table.h

index 88c8cd248213ec7c6ca78585212349b552d126cc..7f892d6c1a6dae51c267e1676ee010e3a94402dc 100644 (file)
@@ -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)