summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorroy <roy@NetBSD.org>2015-05-31 15:08:14 +0000
committerroy <roy@NetBSD.org>2015-05-31 15:08:14 +0000
commit56feee795b9ca512d5763e567be3516cd4003083 (patch)
treefb0376ab0a2524429099c29deb3bd8cdc97e5c9d /sys
parent171f55d10cd5a14f399bd8559d280e0c0e0c5783 (diff)
Fixup ifdrv parameter order.
Diffstat (limited to 'sys')
-rw-r--r--sys/compat/netbsd32/netbsd32_ioctl.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/compat/netbsd32/netbsd32_ioctl.c b/sys/compat/netbsd32/netbsd32_ioctl.c
index faa069c67cb..e1d5401d077 100644
--- a/sys/compat/netbsd32/netbsd32_ioctl.c
+++ b/sys/compat/netbsd32/netbsd32_ioctl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.74 2015/05/27 21:56:43 matt Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.75 2015/05/31 15:08:14 roy Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.74 2015/05/27 21:56:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.75 2015/05/31 15:08:14 roy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -163,7 +163,7 @@ static inline void
netbsd32_to_ifdrv(struct netbsd32_ifdrv *s32p, struct ifdrv *p, u_long cmd)
{
- memcpy(p->ifd_name, s32p->ifd_name, sizeof s32p->ifd_name);
+ memcpy(p->ifd_name, s32p->ifd_name, sizeof p->ifd_name);
p->ifd_cmd = s32p->ifd_cmd;
p->ifd_len = s32p->ifd_len;
p->ifd_data = (void *)NETBSD32PTR64(s32p->ifd_data);
@@ -504,7 +504,8 @@ netbsd32_from_ifmediareq(struct ifmediareq *p, struct netbsd32_ifmediareq *s32p,
static inline void
netbsd32_from_ifdrv(struct ifdrv *p, struct netbsd32_ifdrv *s32p, u_long cmd)
{
- memcpy(p->ifd_name, s32p->ifd_name, sizeof s32p->ifd_name);
+
+ memcpy(s32p->ifd_name, p->ifd_name, sizeof s32p->ifd_name);
s32p->ifd_cmd = p->ifd_cmd;
s32p->ifd_len = p->ifd_len;
NETBSD32PTR32(s32p->ifd_data, p->ifd_data);