From 35c8984e5e6c5d08ca934b82734a7c0b4872ccf6 Mon Sep 17 00:00:00 2001 From: Jesse Gross Date: Fri, 25 Jan 2013 13:53:57 -0800 Subject: [PATCH] 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 Acked-by: Kyle Mestery --- datapath/tunnel.c | 2 -- datapath/tunnel.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/datapath/tunnel.c b/datapath/tunnel.c index 02c642e51..61938910a 100644 --- 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 7ff44f1c5..7e4d1a65b 100644 --- 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; -- 2.43.0