Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net/hostapd*: Work around lack of MLME support
hostap MLME uses Linux data structures and definitions not available in FreeBSD. The ability for hostapd to select the frequency (channel) depends Linux MLME, though strictly it's not required. Work around the Linux MLME requirement to configure device frequency. The detailed description is: hostapd will only set the channel (frequency) when Linux MLME is configured. Enabling NEED_AP_MLME will result in numerous build errors due do Linux data structures and definitions not available under FreeBSD. The code to set the frequency from the selected channel is only within the NEED_AP_MLME code path because without MLME, hostapd_get_hw_features() is an inline that always returns -1 whereas with MLME hostapd_get_hw_features() will obtain hardware features from the kernel. Until such time we simply set the frequency as configured. PR: 276375 MFH: 2024Q1
- Loading branch information
Showing
4 changed files
with
64 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
--- src/ap/hostapd.c.orig 2024-02-18 01:24:29.000000000 -0800 | ||
+++ src/ap/hostapd.c 2024-02-26 20:25:50.505205000 -0800 | ||
@@ -2029,6 +2029,20 @@ | ||
iface->wait_channel_update = 0; | ||
iface->is_no_ir = false; | ||
|
||
+#ifdef __FreeBSD | ||
+ /* XXX hostapd_get_hw_features() is an inline that always returns -1 | ||
+ * because MLME will not build under FreeBSD due to its use of | ||
+ * Linux definitions. Normally FreeBSD would uncondionally execute the | ||
+ * "Not all drivers support..." block. Instead we #ifdef out the entire | ||
+ * block of code instead of maintaining the fallacy that | ||
+ * hostapd_get_hw_features() returns anything meaninful. | ||
+ * | ||
+ * Ideally WANT_AP_MLME should be taught about FreeBSD data structures | ||
+ * and defintions. Instead we do this to enable channel selection in | ||
+ * hostapd.conf. | ||
+ */ | ||
+ iface->freq = iface->conf->channel; | ||
+#else | ||
if (hostapd_get_hw_features(iface)) { | ||
/* Not all drivers support this yet, so continue without hw | ||
* feature data. */ | ||
@@ -2080,6 +2094,7 @@ | ||
if (iface->conf->ieee80211h) | ||
wpa_printf(MSG_DEBUG, "DFS support is enabled"); | ||
} | ||
+#endif | ||
return hostapd_setup_interface_complete(iface, 0); | ||
|
||
fail: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
--- src/ap/hostapd.c.orig 2022-01-16 12:51:29.000000000 -0800 | ||
+++ src/ap/hostapd.c 2024-02-26 20:24:39.350068000 -0800 | ||
@@ -1698,6 +1698,20 @@ | ||
{ | ||
iface->wait_channel_update = 0; | ||
|
||
+#ifdef __FreeBSD | ||
+ /* XXX hostapd_get_hw_features() is an inline that always returns -1 | ||
+ * because MLME will not build under FreeBSD due to its use of | ||
+ * Linux definitions. Normally FreeBSD would uncondionally execute the | ||
+ * "Not all drivers support..." block. Instead we #ifdef out the entire | ||
+ * block of code instead of maintaining the fallacy that | ||
+ * hostapd_get_hw_features() returns anything meaninful. | ||
+ * | ||
+ * Ideally WANT_AP_MLME should be taught about FreeBSD data structures | ||
+ * and defintions. Instead we do this to enable channel selection in | ||
+ * hostapd.conf. | ||
+ */ | ||
+ iface->freq = iface->conf->channel; | ||
+#else | ||
if (hostapd_get_hw_features(iface)) { | ||
/* Not all drivers support this yet, so continue without hw | ||
* feature data. */ | ||
@@ -1744,6 +1758,7 @@ | ||
if (iface->conf->ieee80211h) | ||
wpa_printf(MSG_DEBUG, "DFS support is enabled"); | ||
} | ||
+#endif | ||
return hostapd_setup_interface_complete(iface, 0); | ||
|
||
fail: |