summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2018-08-15 17:15:27 +0200
committerSimon Rettberg2018-08-15 17:15:27 +0200
commit234d4d25a370fb7c3668aeecb86c9be2a629e823 (patch)
tree8876e0117367f9d1f24c2aa07a234569f349aab3
parent[SERVER] rpc: Distinguish between client and server (proxy) connections (diff)
downloaddnbd3-234d4d25a370fb7c3668aeecb86c9be2a629e823.tar.gz
dnbd3-234d4d25a370fb7c3668aeecb86c9be2a629e823.tar.xz
dnbd3-234d4d25a370fb7c3668aeecb86c9be2a629e823.zip
[KERNEL] Fix keep alive timer on 4.15+
-rw-r--r--src/kernel/net.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kernel/net.c b/src/kernel/net.c
index 0b2098d..9e48b86 100644
--- a/src/kernel/net.c
+++ b/src/kernel/net.c
@@ -323,9 +323,9 @@ int dnbd3_net_connect(dnbd3_device_t *dev)
init_timer(&dev->hb_timer);
dev->hb_timer.data = (unsigned long)dev;
dev->hb_timer.function = dnbd3_net_heartbeat;
+#endif
dev->hb_timer.expires = jiffies + HZ;
add_timer(&dev->hb_timer);
-#endif
return 0;
error: ;
if (dev->sock)