vswitch: Send NACK for bad cookie on update attempt.

When the controller sends an update to the switch through the management
channel, a cookie is used to detect changes.  If the controller's idea
of the state of the config file differed from the switch's, the switch
would send an error message.  This commit changes to behavior to not send
an error message, and instead send a negative acknowledgement for the
request.

diff --git a/vswitchd/mgmt.c b/vswitchd/mgmt.c
index c6dd38d0a89946d6304ab1d6c42ae314a92a4107..b981e5b2cd07a8dacbda3bd8f8308cc69e98f9c0 100644 (file)
--- a/vswitchd/mgmt.c
+++ b/vswitchd/mgmt.c
@@ -498,11 +498,8 @@ recv_ofmp_config_update(uint32_t xid, const struct ofmp_header *ofmph)
     if (cfg_lock(ofmpcu->cookie, 0)) {  
         /* xxx cfg_lock can fail for other reasons, such as being
          * xxx locked... */
-        /* xxx This error message should probably send diff info. */
         VLOG_WARN_RL(&rl, "config update failed due to bad cookie\n");
-        //send_config_update_ack(xid, false);
-        send_ofmp_error_msg(xid, OFMPET_BAD_CONFIG, OFMPBCC_OLD_COOKIE, 
-                ofmph, htons(ofmph->header.header.length));
+        send_config_update_ack(xid, false);
         return 0;
     }