CVS commit: src/sys/net

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Sat Aug 10 01:04:05 UTC 2019

Modified Files:
        src/sys/net: if_media.c

Log Message:
rename _ifmedia_ioctl() to ifmedia_ioctl_locked().


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/net/if_media.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/net/if_media.c
diff -u src/sys/net/if_media.c:1.46 src/sys/net/if_media.c:1.47
--- src/sys/net/if_media.c:1.46	Tue May 21 09:18:37 2019
+++ src/sys/net/if_media.c	Sat Aug 10 01:04:05 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_media.c,v 1.46 2019/05/21 09:18:37 msaitoh Exp $	*/
+/*	$NetBSD: if_media.c,v 1.47 2019/08/10 01:04:05 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.46 2019/05/21 09:18:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.47 2019/08/10 01:04:05 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -91,7 +91,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_media.c,v
 
 static void	ifmedia_status(struct ifmedia *, struct ifnet *,
     struct ifmediareq *);
-static int	_ifmedia_ioctl(struct ifnet *, struct ifreq *,
+static int	ifmedia_ioctl_locked(struct ifnet *, struct ifreq *,
     struct ifmedia *, u_long);
 
 /*
@@ -243,7 +243,7 @@ ifmedia_set(struct ifmedia *ifm, int tar
  * Device-independent media ioctl support function.
  */
 static int
-_ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, struct ifmedia *ifm,
+ifmedia_ioctl_locked(struct ifnet *ifp, struct ifreq *ifr, struct ifmedia *ifm,
     u_long cmd)
 {
 	struct ifmedia_entry *match;
@@ -369,10 +369,10 @@ ifmedia_ioctl(struct ifnet *ifp, struct 
 
 	/*
 	 * If if_is_mpsafe(ifp), KERNEL_LOCK isn't held here,
-	 * but _ifmedia_ioctl isn't MP-safe yet, so we must hold the lock.
+	 * but ifmedia_ioctl_locked isn't MP-safe yet, so we must hold the lock.
 	 */
 	KERNEL_LOCK_IF_IFP_MPSAFE(ifp);
-	e = _ifmedia_ioctl(ifp, ifr, ifm, cmd);
+	e = ifmedia_ioctl_locked(ifp, ifr, ifm, cmd);
 	KERNEL_UNLOCK_IF_IFP_MPSAFE(ifp);
 	return e;
 }