[src/netbsd-6]: src/sys/netinet Pull up following revision(s) (requested by g...

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

details:   https://anonhg.NetBSD.org/src/rev/52ee92df7e55
branches:  netbsd-6
changeset: 774215:52ee92df7e55
user:      riz <riz%NetBSD.org@localhost>
date:      Wed Jun 13 19:12:23 2012 +0000

description:
Pull up following revision(s) (requested by gdt in ticket #330):
        sys/netinet/in.c: revision 1.143
Simply use the ifa_addr pointer, rather than taking its address.
Resolves failure to match addresses in SIOC[GD]LIFADDR calls.
Diagnosis and fix is due to Mark Keaton of BBN.

diffstat:

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

diffs (27 lines):

diff -r a80315479f40 -r 52ee92df7e55 sys/netinet/in.c
--- a/sys/netinet/in.c  Wed Jun 13 19:09:39 2012 +0000
+++ b/sys/netinet/in.c  Wed Jun 13 19:12:23 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in.c,v 1.142 2011/12/12 00:06:39 roy Exp $     */
+/*     $NetBSD: in.c,v 1.142.2.1 2012/06/13 19:12:23 riz 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.142 2011/12/12 00:06:39 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.142.2.1 2012/06/13 19:12:23 riz Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet_conf.h"
@@ -729,7 +729,7 @@
                                continue;
                        if (cmp == 0)
                                break;
-                       candidate.s_addr = ((struct sockaddr_in *)&ifa->ifa_addr)->sin_addr.s_addr;
+                       candidate.s_addr = ((struct sockaddr_in *)ifa->ifa_addr)->sin_addr.s_addr;
                        candidate.s_addr &= mask.s_addr;
                        if (candidate.s_addr == match.s_addr)
                                break;