datapath: Remove tunnel configuration sequence number.

When tunnel header caching was in use, it was necessary to detect
configuration changes that would invalidate the cache.  This was
done using a sequence number on the configuration.  However, now
that header caching has been removed the sequence number is no
longer necessary.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Kyle Mestery <kmestery@cisco.com>

diff --git a/datapath/tunnel.c b/datapath/tunnel.c
index 02c642e..6193891 100644 (file)
--- a/datapath/tunnel.c
+++ b/datapath/tunnel.c
@@ -858,8 +858,6 @@ int ovs_tnl_set_options(struct vport *vport, struct nlattr *options)
                goto error;
        }
 
-       mutable->seq = old_mutable->seq + 1;
-
        /* Parse the others configured by userspace. */
        err = tnl_set_config(ovs_dp_get_net(vport->dp), options, tnl_vport->tnl_ops,
                             vport, mutable);

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index 7ff44f1..7e4d1a6 100644 (file)
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -94,7 +94,6 @@ static inline void port_key_set_net(struct port_lookup_key *key, struct net *net
  * @key: Used as key for tunnel port.  Configured via OVS_TUNNEL_ATTR_*
  * attributes.
  * @rcu: RCU callback head for deferred destruction.
- * @seq: Sequence number for distinguishing configuration versions.
  * @tunnel_hlen: Tunnel header length.
  * @out_key: Key to use on output, 0 if this tunnel has no fixed output key.
  * @flags: TNL_F_* flags.
@@ -105,8 +104,6 @@ struct tnl_mutable_config {
        struct port_lookup_key key;
        struct rcu_head rcu;
 
-       unsigned seq;
-
        /* Configured via OVS_TUNNEL_ATTR_* attributes. */
        __be64  out_key;
        u32     flags;