Module Name: src
Committed By: msaitoh
Date: Wed Apr 24 08:54:35 UTC 2019
Modified Files:
src/sys/dev/pci: if_de.c if_tl.c
Log Message:
Remove extra test of SIOCSIFMEDIA.
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/dev/pci/if_de.c
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/pci/if_tl.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/dev/pci/if_de.c
diff -u src/sys/dev/pci/if_de.c:1.158 src/sys/dev/pci/if_de.c:1.159
--- src/sys/dev/pci/if_de.c:1.158 Tue Feb 5 06:17:03 2019
+++ src/sys/dev/pci/if_de.c Wed Apr 24 08:54:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.158 2019/02/05 06:17:03 msaitoh Exp $ */
+/* $NetBSD: if_de.c,v 1.159 2019/04/24 08:54:35 msaitoh Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas (m...@3am-software.com)
@@ -37,7 +37,7 @@
* board which support 21040, 21041, or 21140 (mostly).
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.158 2019/02/05 06:17:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.159 2019/04/24 08:54:35 msaitoh Exp $");
#define TULIP_HDR_DATA
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.
#endif
#include <net/if.h>
-#if defined(SIOCSIFMEDIA) && !defined(TULIP_NOIFMEDIA)
+#if !defined(TULIP_NOIFMEDIA)
#include <net/if_media.h>
#endif
#include <net/if_types.h>
@@ -4796,12 +4796,10 @@ tulip_ifioctl(struct ifnet *ifp, unsigne
#endif
tulip_init(sc);
break;
-#if defined(SIOCSIFMEDIA)
case SIOCSIFMEDIA:
case SIOCGIFMEDIA:
error = ifmedia_ioctl(ifp, ifr, &sc->tulip_ifmedia, cmd);
break;
-#endif
case SIOCADDMULTI:
case SIOCDELMULTI:
Index: src/sys/dev/pci/if_tl.c
diff -u src/sys/dev/pci/if_tl.c:1.112 src/sys/dev/pci/if_tl.c:1.113
--- src/sys/dev/pci/if_tl.c:1.112 Tue Feb 5 06:17:03 2019
+++ src/sys/dev/pci/if_tl.c Wed Apr 24 08:54:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.112 2019/02/05 06:17:03 msaitoh Exp $ */
+/* $NetBSD: if_tl.c,v 1.113 2019/04/24 08:54:35 msaitoh Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.112 2019/02/05 06:17:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.113 2019/04/24 08:54:35 msaitoh Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
@@ -54,9 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.
#include <sys/device.h>
#include <net/if.h>
-#if defined(SIOCSIFMEDIA)
#include <net/if_media.h>
-#endif
#include <net/if_types.h>
#include <net/if_dl.h>
#include <net/route.h>
