From: Andre Noll <maan@systemlinux.org>
Date: Sun, 8 Sep 2013 04:15:31 +0000 (+0000)
Subject: net: Kill dead code in makesock_addrinfo().
X-Git-Tag: v0.5.2~11^2~12
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=f79ec016a7174af2060813cbf092711ce09e6024;p=paraslash.git

net: Kill dead code in makesock_addrinfo().

Either src or dst is NULL, hence the condition is never true.
---

diff --git a/net.c b/net.c
index 07a646b7..d1c6eb51 100644
--- a/net.c
+++ b/net.c
@@ -435,10 +435,6 @@ static int makesock_addrinfo(unsigned l4type, bool passive, struct addrinfo *ai,
 
 	/* Iterate over all src/dst combination, exhausting dst first */
 	for (src = local, dst = remote; src != NULL || dst != NULL; /* no op */ ) {
-		if (src && dst && src->ai_family == AF_INET
-				&& dst->ai_family == AF_INET6)
-			goto get_next_dst; /* v4 -> v6 is not possible */
-
 		ret = socket(src ? src->ai_family : dst->ai_family,
 			sock_type(l4type), l4type);
 		if (ret < 0)