X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-version-opt.c;h=46fb45a4de3d3d4edd74cd6a92a6055bc67a9d67;hb=0ef165ecb57943e17a8ee8270df68ffb8d032e29;hp=0aa2930e07c91a47b4e607adf96c63b7c9200d8e;hpb=b060d38039759f71391c27ba251b663404163283;p=sliver-openvswitch.git

diff --git a/lib/ofp-version-opt.c b/lib/ofp-version-opt.c
index 0aa2930e0..46fb45a4d 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)
 {
@@ -27,9 +33,9 @@ ofp_version_usage(void)
 
     ofputil_format_version_bitmap_names(&msg, OFPUTIL_DEFAULT_VERSIONS);
     printf(
-        "\nOpen Flow Version options:\n"
+        "\nOpenFlow version options:\n"
         "  -V, --version           display version information\n"
-        "  -O, --protocols         set allowed Open Flow versions\n"
+        "  -O, --protocols         set allowed OpenFlow versions\n"
         "                          (default: %s)\n",
         ds_cstr(&msg));
     ds_destroy(&msg);