wiphy: Add parser and getter for max ie len attr
PATCH 1/2 wiphy: Add parser and getter for max ie len attr
--- src/wiphy.c | 12 ++++++++++++ src/wiphy.h | 1 + 2 files changed, 13 insertions(+)
src/wiphy.c +12 -0
@@ -67,6 +67,7 @@ struct wiphy {uint8_t ext_features[(NUM_NL80211_EXT_FEATURES +7 ) /8 ];uint8_t max_num_ssids_per_scan;uint32_t max_roc_duration; +uint16_t max_scan_ie_len;uint16_t supported_iftypes;uint16_t supported_ciphers;struct scan_freq_set *supported_freqs;
@@ -363,6 +364,11 @@ uint8_t wiphy_get_max_num_ssids_per_scan(struct wiphy *wiphy)return wiphy->max_num_ssids_per_scan; } +uint16_t wiphy_get_max_scan_ie_len (struct wiphy *wiphy) +{ +return wiphy->max_scan_ie_len; +} +uint32_t wiphy_get_max_roc_duration (struct wiphy *wiphy) {return wiphy->max_roc_duration;
@@ -834,6 +840,12 @@ static void wiphy_parse_attributes(struct wiphy *wiphy, wiphy->max_num_ssids_per_scan = *((uint8_t *) data);break ; +case NL80211_ATTR_MAX_SCAN_IE_LEN : +if (len !=sizeof (uint16_t )) +l_warn ("Invalid MAX_SCAN_IE_LEN attribute" ); +else + wiphy->max_scan_ie_len = *((uint16_t *) data); +break ;case NL80211_ATTR_SUPPORT_IBSS_RSN : wiphy->support_adhoc_rsn = true;break ;
src/wiphy.h +1 -0
@@ -64,6 +64,7 @@ bool wiphy_rrm_capable(struct wiphy *wiphy);bool wiphy_has_feature (struct wiphy *wiphy,uint32_t feature);bool wiphy_has_ext_feature (struct wiphy *wiphy,uint32_t feature);uint8_t wiphy_get_max_num_ssids_per_scan (struct wiphy *wiphy); +uint16_t wiphy_get_max_scan_ie_len (struct wiphy *wiphy);uint32_t wiphy_get_max_roc_duration (struct wiphy *wiphy);bool wiphy_supports_iftype (struct wiphy *wiphy,uint32_t iftype); const uint8_t *wiphy_get_supported_rates(struct wiphy *wiphy, unsigned int band,
Signature · 1 line
2.21.0
PATCH 2/2 wsc: Check capability before adding .SimpleConfiguration interface
--- src/wiphy.c | 5 +++++ src/wiphy.h | 1 + src/wsc.c | 7 +++++++ 3 files changed, 13 insertions(+)
src/wiphy.c +5 -0
@@ -369,6 +369,11 @@ uint16_t wiphy_get_max_scan_ie_len(struct wiphy *wiphy)return wiphy->max_scan_ie_len; } +bool wiphy_is_scan_ie_supported (struct wiphy *wiphy) +{ +return wiphy->max_scan_ie_len ? true : false; +} +uint32_t wiphy_get_max_roc_duration (struct wiphy *wiphy) {return wiphy->max_roc_duration;
src/wiphy.h +1 -0
@@ -65,6 +65,7 @@ bool wiphy_has_feature(struct wiphy *wiphy, uint32_t feature);bool wiphy_has_ext_feature (struct wiphy *wiphy,uint32_t feature);uint8_t wiphy_get_max_num_ssids_per_scan (struct wiphy *wiphy);uint16_t wiphy_get_max_scan_ie_len (struct wiphy *wiphy); +bool wiphy_is_scan_ie_supported (struct wiphy *wiphy);uint32_t wiphy_get_max_roc_duration (struct wiphy *wiphy);bool wiphy_supports_iftype (struct wiphy *wiphy,uint32_t iftype); const uint8_t *wiphy_get_supported_rates(struct wiphy *wiphy, unsigned int band,
src/wsc.c +7 -0
@@ -1108,6 +1108,13 @@ static void wsc_add_interface(struct netdev *netdev)struct l_dbus *dbus =dbus_get_bus ();struct wsc *wsc; +if (!wiphy_is_scan_ie_supported (netdev_get_wiphy (netdev))) { +l_info ("Simple Configuration isn't supported by ifindex %u" , +netdev_get_ifindex (netdev)); + +return ; + } + wsc = l_new(struct wsc, 1); wsc->netdev = netdev;
Signature · 1 line
2.21.0
Re: [PATCH 2/2] wsc: Check capability before adding .SimpleConfiguration interface
Hi Tim,
src/wiphy.c uint16_t wiphy_get_max_scan_ie_len(struct wiphy *wiphy) · line 376
Quoted 5 lines
src/wiphy.c +5
-0+bool wiphy_is_scan_ie_supported (struct wiphy *wiphy) +{ +return wiphy->max_scan_ie_len ? true : false; +} +
Lets not go overboard adding APIs to wiphy.c now.. You already have something that can accomplish the job, so just use that.
<snip>
Quoted 5 lines
src/wsc.c +0
-0
src/wsc.c static void wsc_add_interface(struct netdev *netdev) · line 1116
Quoted 9 lines
src/wsc.c +6
-0@@ -1108,6 +1108,13 @@ static void wsc_add_interface(struct netdev *netdev)struct l_dbus *dbus =dbus_get_bus ();struct wsc *wsc; +if (!wiphy_is_scan_ie_supported (netdev_get_wiphy (netdev))) { +l_info ("Simple Configuration isn't supported by ifindex %u" , +netdev_get_ifindex (netdev)); + +return ; + }
I don't like the l_info here. This will get printed way too many times due to ifup/ifdown. Perhaps we need to add an L_WARN_ONCE or do this statically here.
src/wsc.c static void wsc_add_interface(struct netdev *netdev) · line 1120
Quoted 5 lines
src/wsc.c +1
-0+ wsc = l_new(struct wsc, 1); wsc->netdev = netdev;
Regards,
-Denis
Denis Kenzior
AppliedHi Tim,
Quoted 5 lines · Tim Kourt
--- src/wiphy.c | 12 ++++++++++++ src/wiphy.h | 1 + 2 files changed, 13 insertions(+)
Applied, thanks.
Regards,
-Denis