[src/trunk]: src/sys/netinet Remove the #if 1 / #endif around some code that ...

[dyoung <dyoung%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/10a8545a85ee
branches:  trunk
changeset: 770672:10a8545a85ee
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Fri Oct 28 22:23:54 2011 +0000

description:
Remove the #if 1 / #endif around some code that appears to be
responsible deleting the 'first' AF_INET address on the interface if the
target address has family == AF_UNSPEC.

diffstat:

 sys/netinet/in.c |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 087b6184af90 -r 10a8545a85ee sys/netinet/in.c
--- a/sys/netinet/in.c  Fri Oct 28 22:08:14 2011 +0000
+++ b/sys/netinet/in.c  Fri Oct 28 22:23:54 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in.c,v 1.139 2011/10/19 01:52:22 dyoung Exp $  */
+/*     $NetBSD: in.c,v 1.140 2011/10/28 22:23:54 dyoung Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.139 2011/10/19 01:52:22 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.140 2011/10/28 22:23:54 dyoung Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet_conf.h"
@@ -352,12 +352,10 @@
                if ((cmd == SIOCDIFADDR || cmd == SIOCGIFALIAS) && ia == NULL)
                        return (EADDRNOTAVAIL);
 
-#if 1 /*def COMPAT_43*/
                if (cmd == SIOCDIFADDR &&
                    ifra->ifra_addr.sin_family == AF_UNSPEC) {
                        ifra->ifra_addr.sin_family = AF_INET;
                }
-#endif
                /* FALLTHROUGH */
        case SIOCSIFADDR:
        case SIOCSIFDSTADDR: