Module Name: src
Committed By: msaitoh
Date: Tue Apr 16 04:26:02 UTC 2019
Modified Files:
src/sys/net: if_tap.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/net/if_tap.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_tap.c
diff -u src/sys/net/if_tap.c:1.109 src/sys/net/if_tap.c:1.110
--- src/sys/net/if_tap.c:1.109 Mon Mar 25 09:59:59 2019
+++ src/sys/net/if_tap.c Tue Apr 16 04:26:02 2019
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_tap.c,v 1
#include <net/if_tap.h>
#include <net/bpf.h>
-#include <compat/sys/sockio.h>
-
#include "ioconf.h"
/*
@@ -581,9 +578,6 @@ tap_ioctl(struct ifnet *ifp, u_long cmd,
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 @@ tap_dev_ioctl(int unit, u_long cmd, void
else
sc->sc_flags &= ~TAP_NBIO;
return 0;
-#ifdef OTAPGIFNAME
- case OTAPGIFNAME:
-#endif
case TAPGIFNAME:
{
struct ifreq *ifr = (struct ifreq *)data;
