From: Ben Pfaff Date: Mon, 17 Oct 2011 18:32:23 +0000 (-0700) Subject: datapath: Fix tunnel reconfiguration that does not change key data. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1184a78452e7160db81e379783cd18937866382;p=openvswitch datapath: Fix tunnel reconfiguration that does not change key data. Without this commit, a pair of commands like ovs-dpctl add-if br0 gre0,type=gre,remote_ip=192.168.5.2,csum=true ovs-dpctl set-if br0 gre0,csum=false would result in a csum of "true" for gre0, that is, the second command would silently have no effect. This could also happen when the key data (such as remote_ip) changed but the port hash just happened to have the same value. This also fixes a small kernel memory leak in this case. An upcoming commit implements the "ovs-dpctl set-if" command mentioned above. Signed-off-by: Ben Pfaff Acked-by: Jesse Gross --- diff --git a/datapath/tunnel.c b/datapath/tunnel.c index 38004e9e..8edff069 100644 --- a/datapath/tunnel.c +++ b/datapath/tunnel.c @@ -1408,6 +1408,8 @@ int tnl_set_options(struct vport *vport, struct nlattr *options) if (port_hash(&mutable->key) != port_hash(&old_mutable->key)) port_table_move_port(vport, mutable); + else + assign_config_rcu(vport, mutable); return 0;