Wireless Daemon for Linux
 help / color / mirror / Atom feed
From: Tim Kourt <tim.a.kourt@linux.intel.com>
To: iwd@lists.01.org
Subject: [PATCH 2/2] wsc: Check capability before adding .SimpleConfiguration interface
Date: Wed, 06 Nov 2019 17:16:24 -0500	[thread overview]
Message-ID: <20191106221624.12072-2-tim.a.kourt@linux.intel.com> (raw)
In-Reply-To: <20191106221624.12072-1-tim.a.kourt@linux.intel.com>

[-- Attachment #1: Type: text/plain, Size: 1714 bytes --]

---
 src/wiphy.c | 5 +++++
 src/wiphy.h | 1 +
 src/wsc.c   | 7 +++++++
 3 files changed, 13 insertions(+)

diff --git a/src/wiphy.c b/src/wiphy.c
index 4446abba..e9397187 100644
--- a/src/wiphy.c
+++ b/src/wiphy.c
@@ -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;
diff --git a/src/wiphy.h b/src/wiphy.h
index 67eafe3c..7d378aa0 100644
--- a/src/wiphy.h
+++ b/src/wiphy.h
@@ -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,
diff --git a/src/wsc.c b/src/wsc.c
index bac6e0cc..ed211834 100644
--- a/src/wsc.c
+++ b/src/wsc.c
@@ -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;
 
-- 
2.21.0

  reply	other threads:[~2019-11-06 22:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-06 22:16 [PATCH 1/2] wiphy: Add parser and getter for max ie len attr Tim Kourt
2019-11-06 22:16 ` Tim Kourt [this message]
2019-11-06 23:03   ` [PATCH 2/2] wsc: Check capability before adding .SimpleConfiguration interface Denis Kenzior
2019-11-06 23:00 ` [PATCH 1/2] wiphy: Add parser and getter for max ie len attr Denis Kenzior

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191106221624.12072-2-tim.a.kourt@linux.intel.com \
    --to=tim.a.kourt@linux.intel.com \
    --cc=iwd@lists.01.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox