From 2284a8763c8ecc6b752fc018976cb6a0c49be3ab Mon Sep 17 00:00:00 2001
From: Mike Cui <cui@nutanix.com>
Date: Mon, 5 Jan 2015 09:24:01 -0800
Subject: [PATCH] set_tcp_* functions should be static since they are not used
 anywhere else.

set_tcp_sockopt in particular conflicts with libnfs's function of the same
name and prevents a a program from statically linking against both libnfs and
libiscsi.

Similar fix should also go into libnfs.
---
 lib/socket.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/socket.c b/lib/socket.c
index cf414f5..3442edf 100644
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -129,7 +129,7 @@ static void set_nonblocking(int fd)
 #endif
 }
 
-int set_tcp_sockopt(int sockfd, int optname, int value)
+static int set_tcp_sockopt(int sockfd, int optname, int value)
 {
 	int level;
 
@@ -151,7 +151,7 @@ int set_tcp_sockopt(int sockfd, int optname, int value)
 #define TCP_USER_TIMEOUT        18
 #endif
 
-int set_tcp_user_timeout(struct iscsi_context *iscsi)
+static int set_tcp_user_timeout(struct iscsi_context *iscsi)
 {
 	if (set_tcp_sockopt(iscsi->fd, TCP_USER_TIMEOUT, iscsi->tcp_user_timeout) != 0) {
 		iscsi_set_error(iscsi, "TCP: Failed to set tcp user timeout. Error %s(%d)", strerror(errno), errno);
@@ -165,7 +165,7 @@ int set_tcp_user_timeout(struct iscsi_context *iscsi)
 #define TCP_SYNCNT        7
 #endif
 
-int set_tcp_syncnt(struct iscsi_context *iscsi)
+static int set_tcp_syncnt(struct iscsi_context *iscsi)
 {
 	if (set_tcp_sockopt(iscsi->fd, TCP_SYNCNT, iscsi->tcp_syncnt) != 0) {
 		iscsi_set_error(iscsi, "TCP: Failed to set tcp syn retries. Error %s(%d)", strerror(errno), errno);