From: David Sommerseth Date: Thu, 7 Jul 2016 11:03:16 +0000 (+0200) Subject: Remove NOP function and callers X-Git-Tag: v2.3.12~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=735c90cb129d0ac361183d1f7371d371f4d4a2f5;p=thirdparty%2Fopenvpn.git 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 Acked-by: Arne Schwabe Message-Id: <1467889519-8193-1-git-send-email-openvpn@sf.lists.topphemmelig.net> URL: http://article.gmane.org/gmane.network.openvpn.devel/12058 (cherry picked from commit 365506d1704f91f827f6e063dc87b325c40e9f29) --- diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index 3468dab5b..2d6d68454 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -168,7 +168,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); } @@ -176,7 +175,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 2bc0c8a1c..7bfbb1192 100644 --- a/src/openvpn/multi.h +++ b/src/openvpn/multi.h @@ -573,10 +573,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 */