aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sommerseth2016-07-07 13:03:16 +0200
committerDavid Sommerseth2016-07-07 17:22:25 +0200
commit365506d1704f91f827f6e063dc87b325c40e9f29 (patch)
tree56b211179d7e3057bf779705b469a7c413917ca3
parent2011b8324feca30df753a4a0a116d37c04742520 (diff)
downloadopenvpn-365506d1704f91f827f6e063dc87b325c40e9f29.zip
openvpn-365506d1704f91f827f6e063dc87b325c40e9f29.tar.gz
Remove NOP function and callers
multi_release_io_lock() and the calls to this function are not providing anything at all. Lets remove it and make the overall code less suprising. Signed-off-by: David Sommerseth <dazo@privateinternetaccess.com> Acked-by: Arne Schwabe <arne@rfc2549.org> Message-Id: <1467889519-8193-1-git-send-email-openvpn@sf.lists.topphemmelig.net> URL: http://article.gmane.org/gmane.network.openvpn.devel/12058
-rw-r--r--src/openvpn/mudp.c2
-rw-r--r--src/openvpn/multi.h5
2 files changed, 0 insertions, 7 deletions
diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c
index 6e0568e..21a7e97 100644
--- a/src/openvpn/mudp.c
+++ b/src/openvpn/mudp.c
@@ -210,7 +210,6 @@ multi_process_io_udp (struct multi_context *m)
else if (status & SOCKET_READ)
{
read_incoming_link (&m->top);
- multi_release_io_lock (m);
if (!IS_SIG (&m->top))
multi_process_incoming_link (m, NULL, mpp_flags);
}
@@ -218,7 +217,6 @@ multi_process_io_udp (struct multi_context *m)
else if (status & TUN_READ)
{
read_incoming_tun (&m->top);
- multi_release_io_lock (m);
if (!IS_SIG (&m->top))
multi_process_incoming_tun (m, mpp_flags);
}
diff --git a/src/openvpn/multi.h b/src/openvpn/multi.h
index 9d8185d..0d369f3 100644
--- a/src/openvpn/multi.h
+++ b/src/openvpn/multi.h
@@ -625,10 +625,5 @@ multi_set_pending (struct multi_context *m, struct multi_instance *mi)
m->pending = mi;
}
-static inline void
-multi_release_io_lock (struct multi_context *m)
-{
-}
-
#endif /* P2MP_SERVER */
#endif /* MULTI_H */