From aaa1c7a982cb5fb078650e377333fdb267b11136 Mon Sep 17 00:00:00 2001 From: Alex Wang Date: Thu, 26 Mar 2015 17:35:32 -0700 Subject: [PATCH] netdev-vport: Do not update netdev when there is no config change. When there is any update from ovsdb, ovs will call netdev_set_config() for every vport. Even though the change is not related to vport, the current implementation will always increment the per-netdev sequence number. Subsequently this could cause even more unwanted effects, e.g. the recreation of 'struct tnl_port' in ofproto level. This commit fixes the issue by only updating the netdev when there is actual configuration change. Signed-off-by: Alex Wang Acked-by: Ben Pfaff --- lib/netdev-vport.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c index a67678481..0c22378f0 100644 --- a/lib/netdev-vport.c +++ b/lib/netdev-vport.c @@ -559,9 +559,11 @@ set_tunnel_config(struct netdev *dev_, const struct smap *args) &tnl_cfg.out_key_flow); ovs_mutex_lock(&dev->mutex); - dev->tnl_cfg = tnl_cfg; - tunnel_check_status_change__(dev); - netdev_change_seq_changed(dev_); + if (memcmp(&dev->tnl_cfg, &tnl_cfg, sizeof tnl_cfg)) { + dev->tnl_cfg = tnl_cfg; + tunnel_check_status_change__(dev); + netdev_change_seq_changed(dev_); + } ovs_mutex_unlock(&dev->mutex); return 0; @@ -733,9 +735,11 @@ set_patch_config(struct netdev *dev_, const struct smap *args) } ovs_mutex_lock(&dev->mutex); - free(dev->peer); - dev->peer = xstrdup(peer); - netdev_change_seq_changed(dev_); + if (!dev->peer || strcmp(dev->peer, peer)) { + free(dev->peer); + dev->peer = xstrdup(peer); + netdev_change_seq_changed(dev_); + } ovs_mutex_unlock(&dev->mutex); return 0; -- 2.20.1