X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-version-opt.c;h=10784fc54e7a721db207dcb56f72d91c8042b580;hb=e379e4d167e31d1cd5f7b86fff091a2e09ff6e45;hp=1801e9f78453aeefc2a9632c2308e4372b39d891;hpb=020c93874e22c1c7492c30fe76a8e496571ede13;p=sliver-openvswitch.git

diff --git a/lib/ofp-version-opt.c b/lib/ofp-version-opt.c
index 1801e9f78..10784fc54 100644
--- a/lib/ofp-version-opt.c
+++ b/lib/ofp-version-opt.c
@@ -1,10 +1,8 @@
 #include <config.h>
+#include "dynamic-string.h"
 #include "ofp-util.h"
 #include "ofp-version-opt.h"
-#include "vlog.h"
-#include "dynamic-string.h"
-
-VLOG_DEFINE_THIS_MODULE(ofp_version);
+#include "ovs-thread.h"
 
 static uint32_t allowed_versions = 0;
 
@@ -17,9 +15,17 @@ get_allowed_ofp_versions(void)
 void
 set_allowed_ofp_versions(const char *string)
 {
+    assert_single_threaded();
     allowed_versions = ofputil_versions_from_string(string);
 }
 
+void
+mask_allowed_ofp_versions(uint32_t bitmap)
+{
+    assert_single_threaded();
+    allowed_versions &= bitmap;
+}
+
 void
 ofp_version_usage(void)
 {
@@ -29,7 +35,7 @@ ofp_version_usage(void)
     printf(
         "\nOpen Flow Version options:\n"
         "  -V, --version           display version information\n"
-        "  --allowed-ofp-versions  list of allowed Open Flow versions\n"
+        "  -O, --protocols         set allowed Open Flow versions\n"
         "                          (default: %s)\n",
         ds_cstr(&msg));
     ds_destroy(&msg);