From: James Prestwood <prestwoj@gmail.com>
To: iwd@lists.linux.dev
Cc: James Prestwood <prestwoj@gmail.com>
Subject: [PATCH 1/7] wiphy: store driver flags directly in wiphy object
Date: Thu, 15 Jun 2023 12:24:09 -0700 [thread overview]
Message-ID: <20230615192415.1718516-1-prestwoj@gmail.com> (raw)
Rather than keep a pointer to the driver_info entry copy the flags
into the wiphy object. This preps for supporting driver flags via
a configuration file, specifically allowing for entries that are a
subset of others. For example:
{ "rtl88*", DEFAULT_IF },
{ "rtl88x2bu", FORCE_PAE },
Before it was not possible to add entires like this since only the
last entry match would get set. Now DEFAULT_IF would get set to all
matches, and FORCE_PAE to only rtl88x2bu. This isn't especially
important for the static list since it could be modified to work
correctly, but will be needed when parsing flags from a
configuration file that may contain duplicates or subsets of the
static list.
---
src/wiphy.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/wiphy.c b/src/wiphy.c
index d06b2447..ca8a4958 100644
--- a/src/wiphy.c
+++ b/src/wiphy.c
@@ -111,7 +111,7 @@ struct wiphy {
char *model_str;
char *vendor_str;
char *driver_str;
- const struct driver_info *driver_info;
+ uint32_t driver_flags;
struct watchlist state_watches;
uint8_t extended_capabilities[EXT_CAP_LEN + 2]; /* max bitmap size + IE header */
uint8_t *iftype_extended_capabilities[NUM_NL80211_IFTYPES];
@@ -685,8 +685,7 @@ bool wiphy_uses_default_if(struct wiphy *wiphy)
if (!wiphy_get_driver(wiphy))
return true;
- if (wiphy->driver_info &&
- wiphy->driver_info->flags & DEFAULT_IF)
+ if (wiphy->driver_flags & DEFAULT_IF)
return true;
return false;
@@ -697,8 +696,7 @@ bool wiphy_control_port_enabled(struct wiphy *wiphy)
const struct l_settings *settings = iwd_get_config();
bool enabled;
- if (wiphy->driver_info &&
- wiphy->driver_info->flags & FORCE_PAE) {
+ if (wiphy->driver_flags & FORCE_PAE) {
l_info("Not using Control Port due to driver quirks: %s",
wiphy_get_driver(wiphy));
return false;
@@ -1885,7 +1883,7 @@ static bool wiphy_get_driver_name(struct wiphy *wiphy)
for (i = 0; i < L_ARRAY_SIZE(driver_infos); i++)
if (!fnmatch(driver_infos[i].prefix, wiphy->driver_str, 0))
- wiphy->driver_info = &driver_infos[i];
+ wiphy->driver_flags |= driver_infos[i].flags;
return true;
}
--
2.25.1
next reply other threads:[~2023-06-15 19:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-15 19:24 James Prestwood [this message]
2023-06-15 19:24 ` [PATCH 2/7] wiphy: allow for user-defined driver flags James Prestwood
2023-06-18 19:03 ` Denis Kenzior
2023-06-15 19:24 ` [PATCH 3/7] doc: document [DriverFlags] group settings James Prestwood
2023-06-15 19:24 ` [PATCH 4/7] wiphy: add [DriverFlags].PowerSaveDisable flag James Prestwood
2023-06-18 19:07 ` Denis Kenzior
2023-06-19 14:49 ` James Prestwood
2023-06-15 19:24 ` [PATCH 5/7] netdev: disable power save if required James Prestwood
2023-06-18 19:11 ` Denis Kenzior
2023-06-19 14:54 ` James Prestwood
2023-06-15 19:24 ` [PATCH 6/7] wiphy: print driver flags on startup James Prestwood
2023-06-15 19:24 ` [PATCH 7/7] doc: Document [DriverFlags].PowerSaveDisable James Prestwood
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=20230615192415.1718516-1-prestwoj@gmail.com \
--to=prestwoj@gmail.com \
--cc=iwd@lists.linux.dev \
/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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).