i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifconfig: Place generic options at the end of the media types list.

Browse Source 
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.
This commit is contained in:
Augustin Cavalier
2022-06-15 21:07:50 -04:00
parent 07b1a21775
commit ac2215ca09
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bin/network/ifconfig/MediaTypes.cpp
+17 -17
View File
@@ -39,23 +39,6 @@ struct media_type {
const media_type kMediaTypes[] = { 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, IFM_ETHER,
"ether", "ether",
@@ -99,6 +82,23 @@ const media_type kMediaTypes[] = {
{ -1, false, NULL, NULL } { -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 }} } { -1, NULL, NULL, -1, {{ -1, NULL, NULL }}, {{ -1, false, NULL, NULL }} }
}; };