Module Name: src
Committed By: msaitoh
Date: Tue Apr 16 04:31:43 UTC 2019
Modified Files:
src/sys/compat/common: if_43.c
src/sys/compat/sys: sockio.h
src/sys/net: if.c
Log Message:
Rename ifreqo2n() and ifreqo2n() to IFREQO2N_43() and IFREQN2O_43():
- ifreqo2n() and ifreqn2o() are for COMPAT_43, so add _43 to the name.
- Uppercase to make it clear those are macros.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.17 -r1.18 src/sys/compat/sys/sockio.h
cvs rdiff -u -r1.449 -r1.450 src/sys/net/if.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/compat/common/if_43.c
diff -u src/sys/compat/common/if_43.c:1.20 src/sys/compat/common/if_43.c:1.21
--- src/sys/compat/common/if_43.c:1.20 Fri Mar 1 11:06:56 2019
+++ src/sys/compat/common/if_43.c Tue Apr 16 04:31:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.c,v 1.20 2019/03/01 11:06:56 pgoyette Exp $ */
+/* $NetBSD: if_43.c,v 1.21 2019/04/16 04:31:42 msaitoh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.20 2019/03/01 11:06:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.21 2019/04/16 04:31:42 msaitoh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -254,7 +254,7 @@ compat_ifioctl(struct socket *so, u_long
if (cmd != ocmd) {
oifr = data;
data = ifr = &ifrb;
- ifreqo2n(oifr, ifr);
+ IFREQO2N_43(oifr, ifr);
}
switch (ocmd) {
@@ -290,7 +290,7 @@ compat_ifioctl(struct socket *so, u_long
}
if (cmd != ocmd)
- ifreqn2o(oifr, ifr);
+ IFREQN2O_43(oifr, ifr);
return error;
}
Index: src/sys/compat/sys/sockio.h
diff -u src/sys/compat/sys/sockio.h:1.17 src/sys/compat/sys/sockio.h:1.18
--- src/sys/compat/sys/sockio.h:1.17 Thu Apr 11 04:43:40 2019
+++ src/sys/compat/sys/sockio.h Tue Apr 16 04:31:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sockio.h,v 1.17 2019/04/11 04:43:40 msaitoh Exp $ */
+/* $NetBSD: sockio.h,v 1.18 2019/04/16 04:31:42 msaitoh Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993, 1994
@@ -123,7 +123,7 @@ struct oifdatareq {
#define OBIOCSETIF _IOW('B', 108, struct oifreq)
#define OTAPGIFNAME _IOR('e', 0, struct oifreq)
-#define ifreqn2o(oi, ni) \
+#define IFREQN2O_43(oi, ni) \
do { \
(void)memcpy((oi)->ifr_name, (ni)->ifr_name, \
sizeof((oi)->ifr_name)); \
@@ -131,7 +131,7 @@ struct oifdatareq {
sizeof((oi)->ifr_ifru)); \
} while (/*CONSTCOND*/0)
-#define ifreqo2n(oi, ni) \
+#define IFREQO2N_43(oi, ni) \
do { \
(void)memcpy((ni)->ifr_name, (oi)->ifr_name, \
sizeof((oi)->ifr_name)); \
Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.449 src/sys/net/if.c:1.450
--- src/sys/net/if.c:1.449 Mon Apr 15 20:51:46 2019
+++ src/sys/net/if.c Tue Apr 16 04:31:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.449 2019/04/15 20:51:46 christos Exp $ */
+/* $NetBSD: if.c,v 1.450 2019/04/16 04:31:43 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.449 2019/04/15 20:51:46 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.450 2019/04/16 04:31:43 msaitoh Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -3158,12 +3158,13 @@ doifioctl(struct socket *so, u_long cmd,
}
ifr = data;
+ /* Pre-convesion */
MODULE_HOOK_CALL(if_cvtcmd_43_hook, (&cmd, ocmd), enosys(), hook);
if (hook != ENOSYS) {
if (cmd != ocmd) {
oifr = data;
data = ifr = &ifrb;
- ifreqo2n(oifr, ifr);
+ IFREQO2N_43(oifr, ifr);
}
}
@@ -3274,8 +3275,10 @@ doifioctl(struct socket *so, u_long cmd,
splx(s);
}
}
+
+ /* Post-convesion */
if (cmd != ocmd)
- ifreqn2o(oifr, ifr);
+ IFREQN2O_43(oifr, ifr);
IFNET_UNLOCK(ifp);
KERNEL_UNLOCK_UNLESS_IFP_MPSAFE(ifp);
@@ -3421,7 +3424,7 @@ ifreq_setaddr(u_long cmd, struct ifreq *
if (cmd != ocmd) {
oifr = (struct oifreq *)(void *)ifr;
ifr = &ifrb;
- ifreqo2n(oifr, ifr);
+ IFREQO2N_43(oifr, ifr);
len = sizeof(oifr->ifr_addr);
}
}
@@ -3433,7 +3436,7 @@ ifreq_setaddr(u_long cmd, struct ifreq *
sockaddr_copy(&ifr->ifr_addr, len, sa);
if (cmd != ocmd)
- ifreqn2o(oifr, ifr);
+ IFREQN2O_43(oifr, ifr);
return 0;
}
