summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authordyoung <dyoung@NetBSD.org>2007-09-01 04:32:50 +0000
committerdyoung <dyoung@NetBSD.org>2007-09-01 04:32:50 +0000
commit2fc102750d6426cd49a560ec309d16d3a5022ae4 (patch)
tree01dc34a21ce59dbdc60bb7af17db129cbcbcbd36 /sys/dev
parentf9794c16db838731ee2eb7afc0dd94697f414bf1 (diff)
Use ifreq_setaddr(), ifreq_getaddr(), sockaddr_in_init(), and
sockaddr_copy(). Constify. Compare pointers with NULL, not 0. Don't "test truth" of pointers, but compare with NULL.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/hd64570.c6
-rw-r--r--sys/dev/ic/midway.c6
-rw-r--r--sys/dev/ic/smc90cx6.c6
-rw-r--r--sys/dev/ppbus/if_plip.c6
4 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/ic/hd64570.c b/sys/dev/ic/hd64570.c
index d16497edb61..9c2725511bd 100644
--- a/sys/dev/ic/hd64570.c
+++ b/sys/dev/ic/hd64570.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.36 2007/03/04 06:01:55 christos Exp $ */
+/* $NetBSD: hd64570.c,v 1.37 2007/09/01 04:32:50 dyoung Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.36 2007/03/04 06:01:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.37 2007/09/01 04:32:50 dyoung Exp $");
#include "bpfilter.h"
#include "opt_inet.h"
@@ -981,7 +981,7 @@ sca_ioctl(ifp, cmd, addr)
error = EAFNOSUPPORT; /* XXX */
break;
}
- switch (ifr->ifr_addr.sa_family) {
+ switch (ifreq_getaddr(cmd, ifr)->sa_family) {
#ifdef INET
case AF_INET:
break;
diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c
index faea82099be..a32e1f0fc40 100644
--- a/sys/dev/ic/midway.c
+++ b/sys/dev/ic/midway.c
@@ -1,4 +1,4 @@
-/* $NetBSD: midway.c,v 1.75 2007/03/04 06:01:58 christos Exp $ */
+/* $NetBSD: midway.c,v 1.76 2007/09/01 04:32:50 dyoung Exp $ */
/* (sync'd to midway.c 1.68) */
/*
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.75 2007/03/04 06:01:58 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.76 2007/09/01 04:32:50 dyoung Exp $");
#include "opt_natm.h"
@@ -1275,7 +1275,7 @@ void *data;
error = EAFNOSUPPORT; /* XXX */
break;
}
- switch (ifr->ifr_addr.sa_family) {
+ switch (ifreq_getaddr(cmd, ifr)->sa_family) {
#ifdef INET
case AF_INET:
break;
diff --git a/sys/dev/ic/smc90cx6.c b/sys/dev/ic/smc90cx6.c
index 60d9be9efe6..1434ed49c35 100644
--- a/sys/dev/ic/smc90cx6.c
+++ b/sys/dev/ic/smc90cx6.c
@@ -1,4 +1,4 @@
-/* $NetBSD: smc90cx6.c,v 1.48 2007/07/11 19:15:02 he Exp $ */
+/* $NetBSD: smc90cx6.c,v 1.49 2007/09/01 04:32:50 dyoung Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.48 2007/07/11 19:15:02 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc90cx6.c,v 1.49 2007/09/01 04:32:50 dyoung Exp $");
/* #define BAHSOFTCOPY */
#define BAHRETRANSMIT /**/
@@ -964,7 +964,7 @@ bah_ioctl(ifp, command, data)
case SIOCADDMULTI:
case SIOCDELMULTI:
- switch (ifr->ifr_addr.sa_family) {
+ switch (ifreq_getaddr(cmd, ifr)->sa_family) {
case AF_INET:
case AF_INET6:
error = 0;
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 956133e9ad0..ee7d4746d65 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_plip.c,v 1.13 2007/04/04 16:31:05 drochner Exp $ */
+/* $NetBSD: if_plip.c,v 1.14 2007/09/01 04:32:50 dyoung Exp $ */
/*-
* Copyright (c) 1997 Poul-Henning Kamp
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.13 2007/04/04 16:31:05 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_plip.c,v 1.14 2007/09/01 04:32:50 dyoung Exp $");
/*
* Parallel port TCP/IP interfaces added. I looked at the driver from
@@ -445,7 +445,7 @@ lpioctl (struct ifnet *ifp, u_long cmd, void *data)
error = EAFNOSUPPORT; /* XXX */
break;
}
- switch (ifr->ifr_addr.sa_family) {
+ switch (ifreq_getaddr(cmd, ifr)->sa_family) {
case AF_INET:
break;
default: