openvswitch: Remove 5-tuple optimization.

The 5-tuple optimization becomes unnecessary with a later per-NUMA
node stats patch.  Remove it first to make the changes easier to
grasp.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>

1 files changed, 1 insertions, 9 deletions

diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index 2d770e28a3a3..9c0dd8aa3117 100644
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -155,14 +155,6 @@ struct flow_stats {
         __be16 tcp_flags;               /* Union of seen TCP flags. */
 };
 
-struct sw_flow_stats {
-        bool is_percpu;
-        union {
-                struct flow_stats *stat;
-                struct flow_stats __percpu *cpu_stats;
-        };
-};
-
 struct sw_flow {
         struct rcu_head rcu;
         struct hlist_node hash_node[2];
@@ -172,7 +164,7 @@ struct sw_flow {
         struct sw_flow_key unmasked_key;
         struct sw_flow_mask *mask;
         struct sw_flow_actions __rcu *sf_acts;
-        struct sw_flow_stats stats;
+        struct flow_stats __percpu *stats;
 };
 
 struct arp_eth_header {