netfilter: flowtable: add nf_flowtable_hw_offload() helper function

This function checks for the NF_FLOWTABLE_HW_OFFLOAD flag, meaning that
the flowtable hardware offload is enabled.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/net/netfilter/nf_flow_table.h b/include/net/netfilter/nf_flow_table.h
index 5a10e28c3e40243e3be251711b3cef5c5929fb41..9ee1eaeaab04124f771f37963c73547c312e902c 100644 (file)
--- a/include/net/netfilter/nf_flow_table.h
+++ b/include/net/netfilter/nf_flow_table.h
@@ -47,6 +47,11 @@ struct nf_flowtable {
        possible_net_t                  net;
 };
 
+static inline bool nf_flowtable_hw_offload(struct nf_flowtable *flowtable)
+{
+       return flowtable->flags & NF_FLOWTABLE_HW_OFFLOAD;
+}
+
 enum flow_offload_tuple_dir {
        FLOW_OFFLOAD_DIR_ORIGINAL = IP_CT_DIR_ORIGINAL,
        FLOW_OFFLOAD_DIR_REPLY = IP_CT_DIR_REPLY,

diff --git a/net/netfilter/nf_flow_table_core.c b/net/netfilter/nf_flow_table_core.c
index 9f134f44d139abb643327778e50a50649ecab6e6..e919bafd68d1fb470585a90c30b9fb1358b9f67a 100644 (file)
--- a/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@ -243,7 +243,7 @@ int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow)
                return err;
        }
 
-       if (flow_table->flags & NF_FLOWTABLE_HW_OFFLOAD)
+       if (nf_flowtable_hw_offload(flow_table))
                nf_flow_offload_add(flow_table, flow);
 
        return 0;

diff --git a/net/netfilter/nf_flow_table_offload.c b/net/netfilter/nf_flow_table_offload.c
index 8a1fe391666eda31e497c5359d4aefa19680c117..b4c79fbb2d82b7529913a55660cb6667510c99dd 100644 (file)
--- a/net/netfilter/nf_flow_table_offload.c
+++ b/net/netfilter/nf_flow_table_offload.c
@@ -812,7 +812,7 @@ void nf_flow_offload_stats(struct nf_flowtable *flowtable,
 
 void nf_flow_table_offload_flush(struct nf_flowtable *flowtable)
 {
-       if (flowtable->flags & NF_FLOWTABLE_HW_OFFLOAD)
+       if (nf_flowtable_hw_offload(flowtable))
                flush_work(&nf_flow_offload_work);
 }
 
@@ -849,7 +849,7 @@ int nf_flow_table_offload_setup(struct nf_flowtable *flowtable,
        struct flow_block_offload bo = {};
        int err;
 
-       if (!(flowtable->flags & NF_FLOWTABLE_HW_OFFLOAD))
+       if (!nf_flowtable_hw_offload(flowtable))
                return 0;
 
        if (!dev->netdev_ops->ndo_setup_tc)