Merge tag 'for-5.15/io_uring-2021-09-04' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / net / openvswitch / flow_table.h

diff --git a/net/openvswitch/flow_table.h b/net/openvswitch/flow_table.h
index 6e7d4ac..9e659db 100644 (file)
--- a/net/openvswitch/flow_table.h
+++ b/net/openvswitch/flow_table.h
@@ -38,12 +38,16 @@ struct mask_count {
        u64 counter;
 };
 
+struct mask_array_stats {
+       struct u64_stats_sync syncp;
+       u64 usage_cntrs[];
+};
+
 struct mask_array {
        struct rcu_head rcu;
        int count, max;
-       u64 __percpu *masks_usage_cntr;
+       struct mask_array_stats __percpu *masks_usage_stats;
        u64 *masks_usage_zero_cntr;
-       struct u64_stats_sync syncp;
        struct sw_flow_mask __rcu *masks[];
 };
 
@@ -53,7 +57,6 @@ struct table_instance {
        struct rcu_head rcu;
        int node_ver;
        u32 hash_seed;
-       bool keep_flows;
 };
 
 struct flow_table {