Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/net rename _ifmedia_ioctl() to ifmedia_ioctl_locked().



details:   https://anonhg.NetBSD.org/src/rev/8ee5dfce0bda
branches:  trunk
changeset: 964627:8ee5dfce0bda
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Aug 10 01:04:05 2019 +0000

description:
rename _ifmedia_ioctl() to ifmedia_ioctl_locked().

diffstat:

 sys/net/if_media.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (49 lines):

diff -r 3c5a310e82cb -r 8ee5dfce0bda sys/net/if_media.c
--- a/sys/net/if_media.c        Fri Aug 09 17:22:02 2019 +0000
+++ b/sys/net/if_media.c        Sat Aug 10 01:04:05 2019 +0000
@@ -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 @@
 
 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 @@
  * 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 @@
 
        /*
         * 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;
 }



Home | Main Index | Thread Index | Old Index