nicira-ext: Remove NXFF_OPENFLOW12.

[openvswitch] / datapath / flow.h

diff --git a/datapath/flow.h b/datapath/flow.h
index f4ef28534022177e7c80158e595690f9615be002..54f0fcdc0f4d4a6d5a461e170fe511988a8b6ae2 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -41,10 +41,8 @@ struct sw_flow_actions {
 };
 
 struct sw_flow_key {
+       struct ovs_key_ipv4_tunnel tun_key;  /* Encapsulating tunnel key. */
        struct {
-               union {
-                       struct ovs_key_ipv4_tunnel tun_key;  /* Encapsulating tunnel key. */
-               } tun;
                u32     priority;       /* Packet QoS priority. */
                u16     in_port;        /* Input switch port (or DP_MAX_PORTS). */
        } phy;
@@ -104,9 +102,6 @@ struct sw_flow {
        struct sw_flow_key key;
        struct sw_flow_actions __rcu *sf_acts;
 
-       atomic_t refcnt;
-       bool dead;
-
        spinlock_t lock;        /* Lock for values below. */
        unsigned long used;     /* Last used time (in jiffies). */
        u64 packet_count;       /* Number of packets matched. */
@@ -133,13 +128,11 @@ void ovs_flow_exit(void);
 
 struct sw_flow *ovs_flow_alloc(void);
 void ovs_flow_deferred_free(struct sw_flow *);
+void ovs_flow_free(struct sw_flow *);
 
 struct sw_flow_actions *ovs_flow_actions_alloc(const struct nlattr *);
 void ovs_flow_deferred_free_acts(struct sw_flow_actions *);
 
-void ovs_flow_hold(struct sw_flow *);
-void ovs_flow_put(struct sw_flow *);
-
 int ovs_flow_extract(struct sk_buff *, u16 in_port, struct sw_flow_key *,
                     int *key_lenp);
 void ovs_flow_used(struct sw_flow *, struct sk_buff *);