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/net80211/ieee80211_var.h | |
| 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/net80211/ieee80211_var.h')
| -rw-r--r-- | sys/net80211/ieee80211_var.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/net80211/ieee80211_var.h b/sys/net80211/ieee80211_var.h index abf04d7c7d1..a55b3272a22 100644 --- a/sys/net80211/ieee80211_var.h +++ b/sys/net80211/ieee80211_var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_var.h,v 1.62 2012/01/21 19:42:16 stsp Exp $ */ +/* $OpenBSD: ieee80211_var.h,v 1.63 2015/09/11 13:02:28 stsp Exp $ */ /* $NetBSD: ieee80211_var.h,v 1.7 2004/05/06 03:07:10 dyoung Exp $ */ /*- @@ -387,9 +387,9 @@ int ieee80211_ioctl(struct ifnet *, u_long, caddr_t); int ieee80211_get_rate(struct ieee80211com *); void ieee80211_watchdog(struct ifnet *); int ieee80211_fix_rate(struct ieee80211com *, struct ieee80211_node *, int); -int ieee80211_rate2media(struct ieee80211com *, int, - enum ieee80211_phymode); -int ieee80211_media2rate(int); +uint64_t ieee80211_rate2media(struct ieee80211com *, int, + enum ieee80211_phymode); +int ieee80211_media2rate(uint64_t); u_int8_t ieee80211_rate2plcp(u_int8_t, enum ieee80211_phymode); u_int8_t ieee80211_plcp2rate(u_int8_t, enum ieee80211_phymode); u_int ieee80211_mhz2ieee(u_int, u_int); |