CVS commit: [netbsd-5] src/sys/netinet

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Wed Aug 22 20:32:21 UTC 2012

Modified Files:
        src/sys/netinet [netbsd-5]: in.c

Log Message:
Pull up following revision(s) (requested by gdt in ticket #1776):
        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.


To generate a diff of this commit:
cvs rdiff -u -r1.127.4.3 -r1.127.4.4 src/sys/netinet/in.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/netinet/in.c
diff -u src/sys/netinet/in.c:1.127.4.3 src/sys/netinet/in.c:1.127.4.4
--- src/sys/netinet/in.c:1.127.4.3	Thu May 20 05:05:58 2010
+++ src/sys/netinet/in.c	Wed Aug 22 20:32:20 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: in.c,v 1.127.4.3 2010/05/20 05:05:58 snj Exp $	*/
+/*	$NetBSD: in.c,v 1.127.4.4 2012/08/22 20:32:20 bouyer 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.127.4.3 2010/05/20 05:05:58 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.127.4.4 2012/08/22 20:32:20 bouyer Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet_conf.h"
@@ -741,7 +741,7 @@ in_lifaddr_ioctl(struct socket *so, u_lo
 				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;