From: Alex Wang <alexw@nicira.com>
Date: Wed, 19 Mar 2014 23:19:28 +0000 (-0700)
Subject: cfm: Define old_cfm_fault as 'enum cfm_fault_reason'.
X-Git-Tag: v2.1.1~22
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;ds=sidebyside;h=9fae78784bb981fc63e2c13608a44b5eec185848;p=cascardo%2Fovs.git

cfm: Define old_cfm_fault as 'enum cfm_fault_reason'.

CFM fault variable type has been changed to 'enum cfm_fault_reason' for
long time.  However, inside cfm_run(), the old_cfm_fault is still defined
as boolean.  This commit fixes the issue.

Found by inspection.

Signed-off-by: Alex Wang <alexw@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/lib/cfm.c b/lib/cfm.c
index d31c1aadc..eed3ee5fb 100644
--- a/lib/cfm.c
+++ b/lib/cfm.c
@@ -397,11 +397,11 @@ cfm_run(struct cfm *cfm) OVS_EXCLUDED(mutex)
     if (timer_expired(&cfm->fault_timer)) {
         long long int interval = cfm_fault_interval(cfm);
         struct remote_mp *rmp, *rmp_next;
+        enum cfm_fault_reason old_cfm_fault = cfm->fault;
         uint64_t old_flap_count = cfm->flap_count;
         int old_health = cfm->health;
         size_t old_rmps_array_len = cfm->rmps_array_len;
         bool old_rmps_deleted = false;
-        bool old_cfm_fault = cfm->fault;
         bool old_rmp_opup = cfm->remote_opup;
         bool demand_override;
         bool rmp_set_opup = false;
@@ -502,7 +502,7 @@ cfm_run(struct cfm *cfm) OVS_EXCLUDED(mutex)
             }
 
             /* If there is a flap, increments the counter. */
-            if (old_cfm_fault == false || cfm->fault == false) {
+            if (old_cfm_fault == 0 || cfm->fault == 0) {
                 cfm->flap_count++;
             }
         }