Module Name: src
Committed By: msaitoh
Date: Tue Apr 16 06:48:33 UTC 2019
Modified Files:
src/sys/net: if_media.c
Log Message:
It's not required (and can't do) to convert OSIOCSIFMEDIA in ifmedia_ioct()
because the conversiosn is done in doifioctl().
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/net/if_media.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_media.c
diff -u src/sys/net/if_media.c:1.40 src/sys/net/if_media.c:1.41
--- src/sys/net/if_media.c:1.40 Wed Apr 10 08:23:46 2019
+++ src/sys/net/if_media.c Tue Apr 16 06:48:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_media.c,v 1.40 2019/04/10 08:23:46 msaitoh Exp $ */
+/* $NetBSD: if_media.c,v 1.41 2019/04/16 06:48:33 msaitoh 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.40 2019/04/10 08:23:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.41 2019/04/16 06:48:33 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,8 +89,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_media.c,v
#include <net/if_media.h>
#include <net/netisr.h>
-#include <compat/sys/sockio.h>
-
static void ifmedia_status(struct ifmedia *, struct ifnet *,
struct ifmediareq *);
static int _ifmedia_ioctl(struct ifnet *, struct ifreq *,
@@ -252,20 +250,11 @@ _ifmedia_ioctl(struct ifnet *ifp, struct
struct ifmedia_entry *match;
struct ifmediareq *ifmr = (struct ifmediareq *)ifr;
int error = 0;
-#ifdef OSIOCSIFMEDIA
- struct oifreq *oifr = (struct oifreq *)ifr;
-#endif
if (ifp == NULL || ifr == NULL || ifm == NULL)
return (EINVAL);
switch (cmd) {
-
-#ifdef OSIOCSIFMEDIA
- case OSIOCSIFMEDIA:
- ifr->ifr_media = oifr->ifr_media;
-#endif
- /* FALLTHROUGH */
/*
* Set the current media.
*/
