Skip to content

Commit

Permalink
ovsdb-idl: omit_alert should implicitly turn off tracking.
Browse files Browse the repository at this point in the history
OVSDB_IDL_TRACK is not valid without OVSDB_IDL_ALERT, so it should
be turned off as well in ovsdb_idl_omit_alert().

Signed-off-by: Han Zhou <[email protected]>
Signed-off-by: Ben Pfaff <[email protected]>
  • Loading branch information
hzhou8 authored and blp committed Apr 4, 2018
1 parent c20ab6a commit b97b1f0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/ovsdb-idl.c
Original file line number Diff line number Diff line change
Expand Up @@ -1512,7 +1512,7 @@ ovsdb_idl_send_cond_change(struct ovsdb_idl *idl)
}
}

/* Turns off OVSDB_IDL_ALERT for 'column' in 'db'.
/* Turns off OVSDB_IDL_ALERT and OVSDB_IDL_TRACK for 'column' in 'db'.
*
* This function should be called between ovsdb_idl_create() and the first call
* to ovsdb_idl_run().
Expand All @@ -1521,10 +1521,10 @@ static void
ovsdb_idl_db_omit_alert(struct ovsdb_idl_db *db,
const struct ovsdb_idl_column *column)
{
*ovsdb_idl_db_get_mode(db, column) &= ~OVSDB_IDL_ALERT;
*ovsdb_idl_db_get_mode(db, column) &= ~(OVSDB_IDL_ALERT | OVSDB_IDL_TRACK);
}

/* Turns off OVSDB_IDL_ALERT for 'column' in 'idl'.
/* Turns off OVSDB_IDL_ALERT and OVSDB_IDL_TRACK for 'column' in 'idl'.
*
* This function should be called between ovsdb_idl_create() and the first call
* to ovsdb_idl_run().
Expand Down

0 comments on commit b97b1f0

Please sign in to comment.