On Sunday, 23 June 2019 17:31:25 CEST Jouni Malinen wrote:
> On Fri, Jun 14, 2019 at 04:49:18PM +0200, Sven Eckelmann wrote:
> > wpa_supplicant: Fix type for ssid->mode comparisons
> > nl80211: Add driver multi iftype HE capability parsing
> > mesh: add support for HE mode
>
> Thanks, applied.
Sorry about not writing about the dependency to
"HE: fix he_capabilities size" [1] in the cover letter. But it seems that you
have noticed this because I saw that you solved the merge conflict caused by
this missing patch.
For everyone else: We need to fix the problem of the incorrect size check in
copy_sta_he_capab before this will actually work with ath11k.
Btw. thanks for fixing all the ieee80211 typos. Am not 100% sure where
following changes came from:
@@ -798,8 +799,9 @@ int hostapd_start_dfs_cac(struct hostapd_iface *iface,
struct hostapd_data *hapd = iface->bss[0];
struct hostapd_freq_params data;
int res;
+ struct hostapd_hw_modes *cmode = iface->current_mode;
- if (!hapd->driver || !hapd->driver->start_dfs_cac)
+ if (!hapd->driver || !hapd->driver->start_dfs_cac || !cmode)
return 0;
if (!iface->conf->ieee80211h) {
@@ -812,8 +814,8 @@ int hostapd_start_dfs_cac(struct hostapd_iface *iface,
vht_enabled, he_enabled, sec_channel_offset,
oper_chwidth, center_segment0,
center_segment1,
- iface->current_mode->vht_capab,
- &iface->current_mode->he_capab[IEEE80211_MODE_AP])) {
+ cmode->vht_capab,
+ &cmode->he_capab[IEEE80211_MODE_AP])) {
wpa_printf(MSG_ERROR, "Can't set freq params");
return -1;
}
Seems like this was important to you to get this changed. Just find it odd
that I only knew about this because I noticed that my patch was silently
modified. And then I find something (the "if") in it which is not self
explanatory and might be an actual bug fix for a different problem which is
now hidden in this larger patch.
Kind regards,
Sven
[1] https://patchwork.ozlabs.org/patch/1109462/Attachment:
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Hostap mailing list Hostap@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/hostap
