Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci Remove extra test of SIOCSIFMEDIA.



details:   https://anonhg.NetBSD.org/src/rev/43de8485afae
branches:  trunk
changeset: 998614:43de8485afae
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Apr 24 08:54:35 2019 +0000

description:
Remove extra test of SIOCSIFMEDIA.

diffstat:

 sys/dev/pci/if_de.c |  8 +++-----
 sys/dev/pci/if_tl.c |  6 ++----
 2 files changed, 5 insertions(+), 9 deletions(-)

diffs (68 lines):

diff -r 29a5871aaecd -r 43de8485afae sys/dev/pci/if_de.c
--- a/sys/dev/pci/if_de.c       Wed Apr 24 08:21:25 2019 +0000
+++ b/sys/dev/pci/if_de.c       Wed Apr 24 08:54:35 2019 +0000
@@ -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 (matt%3am-software.com@localhost)
@@ -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 @@
 #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 @@
 #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:
diff -r 29a5871aaecd -r 43de8485afae sys/dev/pci/if_tl.c
--- a/sys/dev/pci/if_tl.c       Wed Apr 24 08:21:25 2019 +0000
+++ b/sys/dev/pci/if_tl.c       Wed Apr 24 08:54:35 2019 +0000
@@ -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 @@
 #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>



Home | Main Index | Thread Index | Old Index