wiphy: parse TX/RX frame types, and API to check auth frame support
PATCH 1/2 wiphy: parse TX/RX frame types, and API to check auth frame support
Drivers have been identified that do not support authentication via CMD_FRAME. This prevents FT from succeeding but since there is no way to check this in IWD station cannot handle it gracefully.
Now IWD can parse the TX/RX frame types and check if authentication is supported and plan the type of roam according to what protocol will work correctly.
--- src/wiphy.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/wiphy.h | 1 + 2 files changed, 55 insertions(+)
src/wiphy.c +54 -0
@@ -150,6 +150,8 @@ struct wiphy { bool ap_probe_resp_offload : 1; bool supports_uapsd : 1; bool supports_cmd_offchannel : 1; +/* Bit 0 for TX, Bit 1 for RX */ + uint8_t supports_auth_frame : 2; };static struct l_queue *wiphy_list =NULL ;
@@ -938,6 +940,11 @@ bool wiphy_supports_cmd_offchannel(const struct wiphy *wiphy)return wiphy->supports_cmd_offchannel; } +bool wiphy_supports_auth_frame (const struct wiphy *wiphy) +{ +return wiphy->supports_auth_frame ==0x03 ; +} +const uint8_t *wiphy_get_ht_capabilities (const struct wiphy *wiphy,enum band_freq band,size_t *size)
@@ -1816,6 +1823,45 @@ static void parse_iftype_extended_capabilities(struct wiphy *wiphy, } } +static void wiphy_parse_frame_types (struct wiphy *wiphy, +struct l_genl_attr *attr,bool tx) +{ +uint16_t type, len; +const void *data; + +while (l_genl_attr_next (attr,NULL ,NULL ,NULL )) { +struct l_genl_attr types; + +if (!l_genl_attr_recurse (attr, &types)) +continue ; + +while (l_genl_attr_next (&types, &type, &len, &data)) { +uint16_t frame_type; + +if (L_WARN_ON (type !=NL80211_ATTR_FRAME_TYPE )) +continue ; + +if (L_WARN_ON (len !=2 )) +continue ; + + frame_type =l_get_le16 (data); + +switch (frame_type) { +/* Authentication */ +case 0x00b0 : +if (tx) + wiphy->supports_auth_frame |=0x01 ; +else + wiphy->supports_auth_frame |=0x02 ; +break ; +default : +break ; + } + + } + } +} +static void wiphy_parse_attributes (struct wiphy *wiphy,struct l_genl_msg *msg) {
@@ -1903,6 +1949,14 @@ static void wiphy_parse_attributes(struct wiphy *wiphy,case NL80211_ATTR_SUPPORT_AP_UAPSD : wiphy->supports_uapsd = true;break ; +case NL80211_ATTR_TX_FRAME_TYPES : +if (l_genl_attr_recurse (&attr, &nested)) +wiphy_parse_frame_types (wiphy, &nested, true); +break ; +case NL80211_ATTR_RX_FRAME_TYPES : +if (l_genl_attr_recurse (&attr, &nested)) +wiphy_parse_frame_types (wiphy, &nested, false); +break ; } } }
src/wiphy.h +1 -0
@@ -142,6 +142,7 @@ void wiphy_get_reg_domain_country(struct wiphy *wiphy, char *out);bool wiphy_country_is_unknown (struct wiphy *wiphy);bool wiphy_supports_uapsd (const struct wiphy *wiphy);bool wiphy_supports_cmd_offchannel (const struct wiphy *wiphy); +bool wiphy_supports_auth_frame (const struct wiphy *wiphy); const uint8_t *wiphy_get_ht_capabilities(const struct wiphy *wiphy, enum band_freq band,
Signature · 1 line
2.34.1
PATCH 2/2 station: check if authentication is supported via CMD_FRAME
If the driver does not support this don't allow FT-over-Air as CMD_FRAME will fail. This will downgrade the roam to reassociation. In the future IWD could instead use CMD_AUTHENTICATE, but thats a larger change. This will at least get these drivers functioning better.
--- src/station.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-)
src/station.c +23 -8
@@ -2162,14 +2162,29 @@ static bool station_can_fast_transition(struct station *station,return false; } -/* -* FT-over-Air in its current form relies on CMD_REMAIN_ON_CHANNEL. Some -* drivers do not support this so only allow over-DS if this is the case -*/ -if (!(hs->mde[4 ] &1 ) && - !wiphy_supports_cmd_offchannel (station->wiphy)) { -l_debug ("FT-over-Air needs offchannel, using reassociation" ); -return false; +if (!(hs->mde[4 ] &1 )) { +/* +* FT-over-Air in its current form relies on +* CMD_REMAIN_ON_CHANNEL. Some drivers do not support this so +* only allow over-DS if this is the case +*/ +if (!wiphy_supports_cmd_offchannel (station->wiphy)) { +l_debug ("FT-over-Air needs offchannel, using " +"reassociation" ); +return false; + } + +/* +* TODO: if drivers don't support TX/RX of auth frames via +* CMD_FRAME IWD could choose to use CMD_AUTHENTICATE +* instead. For now just avoid FT roaming and let these +* drivers roam via reassociation. +*/ +if (!wiphy_supports_auth_frame (station->wiphy)) { +l_debug ("FT-over-Air needs CMD_FRAME auth, using " +"reassociation" ); +return false; + } }return true;
Signature · 1 line
2.34.1
Hi Dierk,
Quoted 11 lines · James Prestwood
Drivers have been identified that do not support authentication via
CMD_FRAME. This prevents FT from succeeding but since there is no way to check this in IWD station cannot handle it gracefully.Now IWD can parse the TX/RX frame types and check if authentication is supported and plan the type of roam according to what protocol will work correctly.
--- src/wiphy.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/wiphy.h | 1 + 2 files changed, 55 insertions(+)
Were you able to try these patches yet? I can't test them on the hardware you are using, so if possible we'd like a confirmation the fix worked as expected before they are merged upstream.
Thanks,
James