diff options
| author | Stefan Sperling <stsp@cvs.openbsd.org> | 2015-09-11 13:02:29 +0000 |
|---|---|---|
| committer | Stefan Sperling <stsp@cvs.openbsd.org> | 2015-09-11 13:02:29 +0000 |
| commit | 60446fe20a75a96e4e90d49e026768a4a5de327e (patch) | |
| tree | 4df36879019283b812826de0f68df84379613b0f /sys/dev/mii/mii_physubr.c | |
| parent | 39d4e265d62cc7fb7ea6c2dfa113f7e47cb3a730 (diff) | |
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/mii/mii_physubr.c')
| -rw-r--r-- | sys/dev/mii/mii_physubr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c index 368112fd717..5258c66e143 100644 --- a/sys/dev/mii/mii_physubr.c +++ b/sys/dev/mii/mii_physubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mii_physubr.c,v 1.44 2014/12/05 15:50:04 mpi Exp $ */ +/* $OpenBSD: mii_physubr.c,v 1.45 2015/09/11 13:02:28 stsp Exp $ */ /* $NetBSD: mii_physubr.c,v 1.20 2001/04/13 23:30:09 thorpej Exp $ */ /*- @@ -509,7 +509,7 @@ mii_phy_match(const struct mii_attach_args *ma, const struct mii_phydesc *mpd) /* * Return the flow control status flag from MII_ANAR & MII_ANLPAR. */ -int +uint64_t mii_phy_flowstatus(struct mii_softc *sc) { int anar, anlpar; @@ -561,7 +561,7 @@ mii_phy_flowstatus(struct mii_softc *sc) * Given an ifmedia word, return the corresponding ANAR value. */ int -mii_anar(int media) +mii_anar(uint64_t media) { int rv; |