summaryrefslogtreecommitdiffstats
path: root/sys/dev/isa/if_ex.c
diff options
context:
space:
mode:
authorstsp <stsp@openbsd.org>2015-09-11 13:02:28 +0000
committerstsp <stsp@openbsd.org>2015-09-11 13:02:28 +0000
commitf2a0e4231559234e0dc6d691942c15503a0dc417 (patch)
treec904a2988f33f61597f286cfc60b29a10ce65837 /sys/dev/isa/if_ex.c
parentfix verify to allow for servername->name (diff)
downloadwireguard-openbsd-f2a0e4231559234e0dc6d691942c15503a0dc417.tar.xz
wireguard-openbsd-f2a0e4231559234e0dc6d691942c15503a0dc417.zip
Make room for media types of the future. Extend the ifmedia word to 64 bits.
This changes numbers of the SIOCSIFMEDIA and SIOCGIFMEDIA ioctls and grows struct ifmediareq. Old ifconfig and dhclient binaries can still assign addresses, however the 'media' subcommand stops working. Recompiling ifconfig and dhclient with new headers before a reboot should not be necessary unless in very special circumstances where non-default media settings must be used to get link and console access is not available. There may be some MD fallout but that will be cleared up later. ok deraadt miod with help and suggestions from several sharks attending l2k15
Diffstat (limited to 'sys/dev/isa/if_ex.c')
-rw-r--r--sys/dev/isa/if_ex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/isa/if_ex.c b/sys/dev/isa/if_ex.c
index 7f1f7c4091f..9ad0cec6bf0 100644
--- a/sys/dev/isa/if_ex.c
+++ b/sys/dev/isa/if_ex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ex.c,v 1.39 2015/06/24 09:40:54 mpi Exp $ */
+/* $OpenBSD: if_ex.c,v 1.40 2015/09/11 13:02:28 stsp Exp $ */
/*
* Copyright (c) 1997, Donald A. Schmidt
* Copyright (c) 1996, Javier Martín Rueda (jmrueda@diatel.upm.es)
@@ -109,7 +109,7 @@ int ex_ioctl(struct ifnet *, u_long, caddr_t);
void ex_setmulti(struct ex_softc *);
void ex_reset(struct ex_softc *);
void ex_watchdog(struct ifnet *);
-int ex_get_media(struct ex_softc *);
+uint64_t ex_get_media(struct ex_softc *);
int ex_ifmedia_upd(struct ifnet *);
void ex_ifmedia_sts(struct ifnet *, struct ifmediareq *);
@@ -900,7 +900,7 @@ ex_watchdog(struct ifnet *ifp)
DODEBUG(Start_End, printf("ex_watchdog: finish\n"););
}
-int
+uint64_t
ex_get_media(struct ex_softc *sc)
{
int current, media;