Merge "master" into "next".

[openvswitch] / lib / vconn-stream.c

diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c
index 594eded5571458e982efbede3336179a15530ee0..99eb21a89d9598f36d63e4345993e8789d5ff7f6 100644 (file)
--- a/lib/vconn-stream.c
+++ b/lib/vconn-stream.c
@@ -72,7 +72,7 @@ vconn_stream_new(struct stream *stream, int connect_status)
  *
  * Returns 0 if successful, otherwise a positive errno value. */
 static int
-vconn_stream_open(const char *name_, char *suffix UNUSED,
+vconn_stream_open(const char *name_, char *suffix OVS_UNUSED,
                   struct vconn **vconnp)
 {
     struct stream *stream;
@@ -298,7 +298,7 @@ pvconn_pstream_cast(struct pvconn *pvconn)
  * Returns 0 if successful, otherwise a positive errno value.  (The current
  * implementation never fails.) */
 static int
-pvconn_pstream_listen(const char *name_, char *suffix UNUSED,
+pvconn_pstream_listen(const char *name_, char *suffix OVS_UNUSED,
                       struct pvconn **pvconnp)
 {
     struct pvconn_pstream *ps;