Module Name: src
Committed By: msaitoh
Date: Wed Apr 10 08:22:19 UTC 2019
Modified Files:
src/sys/net: if_media.c
Log Message:
Fix a bug that OSIOCSIFMEDIA can't treat. Add missing inclusion of
compat/sys/sockio.h.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 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.38 src/sys/net/if_media.c:1.39
--- src/sys/net/if_media.c:1.38 Thu Feb 28 05:40:58 2019
+++ src/sys/net/if_media.c Wed Apr 10 08:22:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_media.c,v 1.38 2019/02/28 05:40:58 msaitoh Exp $ */
+/* $NetBSD: if_media.c,v 1.39 2019/04/10 08:22:18 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.38 2019/02/28 05:40:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_media.c,v 1.39 2019/04/10 08:22:18 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,6 +89,8 @@ __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 *, struct ifmedia *, u_long);
@@ -260,8 +262,8 @@ _ifmedia_ioctl(struct ifnet *ifp, struct
#ifdef OSIOCSIFMEDIA
case OSIOCSIFMEDIA:
ifr->ifr_media = oifr->ifr_media;
- /*FALLTHROUGH*/
#endif
+ /* FALLTHROUGH */
/*
* Set the current media.
*/
