From b6c4da210dccd802d775a58af1b6eac2e866d011 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@nicira.com>
Date: Thu, 27 Mar 2014 10:04:55 -0700
Subject: [PATCH] stream-tcp: Fix error message for failed TCP_NODELAY setting
 on Windows.

Reported-by: Gurucharan Shetty <gshetty@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Kyle Mestery <mestery@noironetworks.com>
Acked-by: Gurucharan Shetty <gshetty@nicira.com>
---
 lib/stream-tcp.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/stream-tcp.c b/lib/stream-tcp.c
index 55e581878..4cd4e6f18 100644
--- a/lib/stream-tcp.c
+++ b/lib/stream-tcp.c
@@ -55,9 +55,11 @@ new_tcp_stream(const char *name, int fd, int connect_status,
 
     retval = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof on);
     if (retval) {
-        VLOG_ERR("%s: setsockopt(TCP_NODELAY): %s", name, ovs_strerror(errno));
+        int error = sock_errno();
+        VLOG_ERR("%s: setsockopt(TCP_NODELAY): %s",
+                 name, sock_strerror(error));
         close(fd);
-        return errno;
+        return error;
     }
 
     return new_fd_stream(name, fd, connect_status, streamp);
-- 
2.20.1