Simplify internal do_mcast_opt option path. No need for double checks and double code

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1309379 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 3 insertions, 7 deletions

diff --git a/network_io/unix/multicast.c b/network_io/unix/multicast.c
index 81051a18d..d6e2ca7b7 100644
--- a/network_io/unix/multicast.c
+++ b/network_io/unix/multicast.c
@@ -208,17 +208,13 @@ static apr_status_t do_mcast_opt(int type, apr_socket_t *sock,
         }
     }
 #if APR_HAVE_IPV6
-    else if (sock_is_ipv6(sock) && type == IP_MULTICAST_LOOP) {
-        type = IPV6_MULTICAST_LOOP;
-        if (setsockopt(sock->socketdes, IPPROTO_IPV6, type,
-                       (const void *) &value, sizeof(value)) == -1) {
-            rv = errno;
-        }
-    }
     else if (sock_is_ipv6(sock)) {
         if (type == IP_MULTICAST_TTL) {
             type = IPV6_MULTICAST_HOPS;
         }
+        else if (type == IP_MULTICAST_LOOP) {
+            type = IPV6_MULTICAST_LOOP;
+        }
         else {
             return APR_ENOTIMPL;
         }