Skip to contentSkip to conversation

Remove NOP function and callers

PATCH In review David Sommerseth 2 participants 3 messages Jul 7, 2016

lore
Share & tools
lore

David Sommerseth

author
#0 lore raw

PATCH 1/1 Remove NOP function and callers

From: David Sommerseth <[email protected]...>

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 <[email protected]...>
---
 src/openvpn/mudp.c  | 2 --
 src/openvpn/multi.h | 5 -----
 2 files changed, 7 deletions(-)
src/openvpn/mudp.c +0 -2
index 6e0568e..21a7e97 100644
@@ -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);
     }
src/openvpn/multi.h +0 -5
index 9d8185d..0d369f3 100644
@@ -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 */
Signature · 1 line
1.8.3.1
#1 lore raw

Am 07.07.16 um 13:05 schrieb David Sommerseth:

Quoted 6 lines

From: David Sommerseth <[email protected]...>

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.

Easy ACK.

Arne

author
#2 lore raw
In reply to David Sommerseth

From: David Sommerseth <[email protected]...>

This patch has been applied to the master and release/2.3 branches.

commit 365506d1704f91f827f6e063dc87b325c40e9f29 (master) commit 735c90cb129d0ac361183d1f7371d371f4d4a2f5 (release/2.3)

Author: David Sommerseth
Date:   Thu Jul 7 13:03:16 2016 +0200
     Remove NOP function and callers

     Signed-off-by: David Sommerseth <[email protected]...>
     Acked-by: Arne Schwabe <[email protected]...>
     Message-Id: <[email protected]...>
     URL: http://article.gmane.org/gmane.network.openvpn.devel/12058

--
kind regards,

David Sommerseth