[Spice-commits] Branch '0.12' - server/reds.c

[Christophe Fergau]

 server/reds.c |    8 --------
 1 file changed, 8 deletions(-)

New commits:
commit 5bcb3b6a862be2fb28a727a6923349c1125b2377
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Apr 14 17:09:22 2016 +0200

    Revert "Set TCP_KEEPINTVL when enabling TCP keepalive"
    
    This reverts commit 3336d892c3d8647868423300905e5cad67de1db1.
    
    This was NACK'ed for the master branch, but was pushed by mistake to the
    0.12 branch

diff --git a/server/reds.c b/server/reds.c
index f185dea..61bf735 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -2271,14 +2271,6 @@ static bool reds_init_keepalive(int socket)
         }
     }
 
-    if (setsockopt(socket, SOL_TCP, TCP_KEEPINTVL,
-                   &keepalive_timeout, sizeof(keepalive_timeout)) == -1) {
-        if (errno != ENOTSUP) {
-            spice_printerr("setsockopt for keepalive interval failed, %s", strerror(errno));
-            return false;
-        }
-    }
-
     return true;
 }