[src/trunk]: src/sys/net The path of SOICSIFMEDA or TAPGIFNAME calls are as f...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0e2d884822f6
branches:  trunk
changeset: 998357:0e2d884822f6
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Apr 16 04:26:02 2019 +0000

description:
The path of SOICSIFMEDA or TAPGIFNAME calls are as follows:

 doifioctl()

    pre-convert (if_cvtcmd_43_hook & ifreqo2n)

    (*ifp->if_ioctl)(ifp, cmd, data);

    post-convert (ifreqn2o)

so it's not required to check OSIOCSIFMEDIA and OTAPGIFNAME in if_tap.c.
Those two command is converted to new command in if_cvtcmd_43_hook and
always new commands are seen in tap_ioctl().

OK'd by pgoyette.

diffstat:

 sys/net/if_tap.c |  13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diffs (52 lines):

diff -r 681c0bc47ba1 -r 0e2d884822f6 sys/net/if_tap.c
--- a/sys/net/if_tap.c  Tue Apr 16 02:10:09 2019 +0000
+++ b/sys/net/if_tap.c  Tue Apr 16 04:26:02 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tap.c,v 1.109 2019/03/25 09:59:59 pgoyette Exp $    */
+/*     $NetBSD: if_tap.c,v 1.110 2019/04/16 04:26:02 msaitoh Exp $     */
 
 /*
  *  Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,12 +33,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.109 2019/03/25 09:59:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1.110 2019/04/16 04:26:02 msaitoh Exp $");
 
 #if defined(_KERNEL_OPT)
 
 #include "opt_modular.h"
-#include "opt_compat_netbsd.h"
 #endif
 
 #include <sys/param.h>
@@ -70,8 +69,6 @@
 #include <net/if_tap.h>
 #include <net/bpf.h>
 
-#include <compat/sys/sockio.h>
-
 #include "ioconf.h"
 
 /*
@@ -581,9 +578,6 @@
        s = splnet();
 
        switch (cmd) {
-#ifdef OSIOCSIFMEDIA
-       case OSIOCSIFMEDIA:
-#endif
        case SIOCSIFMEDIA:
        case SIOCGIFMEDIA:
                error = ifmedia_ioctl(ifp, ifr, &sc->sc_im, cmd);
@@ -1164,9 +1158,6 @@
                else
                        sc->sc_flags &= ~TAP_NBIO;
                return 0;
-#ifdef OTAPGIFNAME
-       case OTAPGIFNAME:
-#endif
        case TAPGIFNAME:
                {
                        struct ifreq *ifr = (struct ifreq *)data;