- (djm) [packet.c] bz#1963: Fix IPQoS not being set on non-mapped v4-in-v6

   addressed connections. ok dtucker@

2 files changed, 2 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 97b39aaac..03c2674f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
  - (djm) [openbsd-compat/port-linux.c] bz#1960: fix crash on SELinux 
    systems where sshd is run in te wrong context. Patch from Sven
    Vermeulen; ok dtucker@
+ - (djm) [packet.c] bz#1963: Fix IPQoS not being set on non-mapped v4-in-v6
+   addressed connections. ok dtucker@
 
 20120224
  - (dtucker) [audit-bsm.c configure.ac] bug #1968: enable workarounds for BSM
diff --git a/packet.c b/packet.c
index 2f85232a6..d0c66fe57 100644
--- a/packet.c
+++ b/packet.c
@@ -432,8 +432,6 @@ packet_connection_af(void)
 	if (getsockname(active_state->connection_out, (struct sockaddr *)&to,
 	    &tolen) < 0)
 		return 0;
-	if (to.ss_family == AF_INET)
-		return 1;
 #ifdef IPV4_IN_IPV6
 	if (to.ss_family == AF_INET6 &&
 	    IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&to)->sin6_addr))