hrev56193 adds 1 changeset to branch 'master'
old head: 07b1a217753100f8c8b0ff74faa8d459fc84555e
new head: ac2215ca09fa6683037d5ce3c603090d71b82642
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=ac2215ca09fa+%5E07b1a2177531
----------------------------------------------------------------------------
ac2215ca09fa: ifconfig: Place generic options at the end of the media types
list.
Otherwise we will get "Auto-select" even if something more specific
applies, e.g. in the case of IFM_IEEE80211 at least.
Fixes media type detection for OpenBSD drivers.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev56193
Commit: ac2215ca09fa6683037d5ce3c603090d71b82642
URL: https://git.haiku-os.org/haiku/commit/?id=ac2215ca09fa
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Thu Jun 16 01:07:50 2022 UTC
----------------------------------------------------------------------------
1 file changed, 17 insertions(+), 17 deletions(-)
src/bin/network/ifconfig/MediaTypes.cpp | 34 ++++++++++++++---------------
----------------------------------------------------------------------------
diff --git a/src/bin/network/ifconfig/MediaTypes.cpp
b/src/bin/network/ifconfig/MediaTypes.cpp
index 11c45b04d1..14a5d34c12 100644
--- a/src/bin/network/ifconfig/MediaTypes.cpp
+++ b/src/bin/network/ifconfig/MediaTypes.cpp
@@ -39,23 +39,6 @@ struct media_type {
const media_type kMediaTypes[] = {
- {
- 0, // for generic options
- "all",
- "All",
- IFM_TMASK,
- {
- { IFM_AUTO, "auto", "Auto-select" },
- { -1, NULL, NULL }
- },
- {
- { IFM_FDX, true, "fullduplex", "Full Duplex" },
- { IFM_HDX, true, "halfduplex", "Half Duplex" },
- { IFM_LOOP, true, "loop", "Loop" },
- //{ IFM_ACTIVE, false, "active", "Active" },
- { -1, false, NULL, NULL }
- }
- },
{
IFM_ETHER,
"ether",
@@ -99,6 +82,23 @@ const media_type kMediaTypes[] = {
{ -1, false, NULL, NULL }
}
},
+ {
+ 0, // for generic options
+ "all",
+ "All",
+ IFM_TMASK,
+ {
+ { IFM_AUTO, "auto", "Auto-select" },
+ { -1, NULL, NULL }
+ },
+ {
+ { IFM_FDX, true, "fullduplex", "Full Duplex" },
+ { IFM_HDX, true, "halfduplex", "Half Duplex" },
+ { IFM_LOOP, true, "loop", "Loop" },
+ //{ IFM_ACTIVE, false, "active", "Active" },
+ { -1, false, NULL, NULL }
+ }
+ },
{ -1, NULL, NULL, -1, {{ -1, NULL, NULL }}, {{ -1, false, NULL, NULL }}
}
};
