| commit | 7c65e9d2ec42c9d4a8163e8abd12ae39db63746d | [log] [tgz] |
|---|---|---|
| author | Arowa Suliman <arowa@chromium.org> | Tue Nov 05 03:59:56 2024 |
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | Tue Nov 05 18:45:16 2024 |
| tree | 68c28b07219b35c6b51cef942d9ee2ffc7116496 | |
| parent | 57abfe8c0c86937120be97523dd9fc0ccd9fd666 [diff] |
Revert "FROMLIST: wpa_supplicant_select_network: check last scan ssids" This reverts commit 57abfe8c0c86937120be97523dd9fc0ccd9fd666. Reason for revert: A new version is submitted upstream for review Original change's description: > FROMLIST: wpa_supplicant_select_network: check last scan ssids > > This recent patch [1] introduced a redundant scan when selecting a > hidden network that was previously scanned and found. This occurs > because the code only checks for the condition > `(wpa_s->no_suitable_network || wpa_s->last_scan_external)`, which > doesn't cover the case where the last scan successfully found the hidden > SSID. > > This patch saves the scanned SSIDs from the last scan and updates the > condition to check if the hidden SSID was included. If the hidden SSID > is not found in `last_scan_ssids`, it triggers a new scan > (`request_new_scan = true`). > > [1] > https://w1.fi/cgit/hostap/commit/?id=92374d59d4efea5c8b61ed2ceef141c26bcd7f99 > > (am from https://patchwork.ozlabs.org/project/hostap/patch/20241007163329.3060529-1-arowa@google.com/) > > BUG=b:363899693 > TEST=Ran hwsim and wifi_matfunc on Rex/Karis/BE200 + NUC-AP > > Checked the net.log for wifi.SimpleConnect.hidden5ht20 and there are no > redundant scans. > > Ran checkpatch.pl [PASS] > > UPSTREAM-TASK=b:372508941 > > Change-Id: I7d9b1d99294c2b5fbc4c12516540fb998b006020 > Signed-off-by: Arowa Suliman <arowa@google.com> > Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/hostap/+/5896176 > Reviewed-by: Sean Paul <sean@poorly.run> > Reviewed-by: Matthew Wang <matthewmwang@chromium.org> > Tested-by: Arowa Suliman <arowa@chromium.org> > Commit-Queue: Arowa Suliman <arowa@chromium.org> BUG=b:363899693 Change-Id: I3fc573ca6b3a4de4cdf59b7ce143f18a9295d8f3 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/hostap/+/5991875 Tested-by: Arowa Suliman <arowa@chromium.org> Commit-Queue: Arowa Suliman <arowa@chromium.org> Reviewed-by: Matthew Wang <matthewmwang@chromium.org>
This documents how to develop, test, and submit code to wpa_supplicant in ChromeOS.
This follows the standard ChromeOS development flow:
cros-workon-${BOARD} wpa_supplicant-cros emerge-${BOARD} wpa_supplicant-cros cros deploy ${DUT} wpa_supplicant-cros
Note that wpa_supplicant-cros/current and wpa_supplicant-cros/next are identical. This is a vestige of how we used to uprevs, but now that we've converted to automated merges, we no longer regularly use both directories other than for the occasional rollout of a new feature flag. Please develop in wpa_supplicant-cros/current.
To restart wpa_supplicant after deploying:
(DUT) # restart wpasupplicant
sudo -u wpa -g wpa wpa_cli
dbus-send --system --print-reply --dest=fi.w1.wpa_supplicant1 \ /fi/w1/wpa_supplicant1/Interfaces/0 \ fi.w1.wpa_supplicant1.Interface.AddNetwork \ ...
or gdbus:
gdbus call --system --dest fi.w1.wpa_supplicant1 --object-path \ /fi/w1/wpa_supplicant1/Interfaces/0 --method \ fi.w1.wpa_supplicant1.Interface.AddNetwork \ ...
We try to follow kernel conventions detailed here. For trivial changes, feel free to send them upstream without internal review (see below for more details). Otherwise, upload them with a WIP: prefix to indicate that you'd like internal feedback first. After getting a +1 from relevant reviewers, you should send the patch upstream. For time-sensitive changes, we allow landing the change as FROMLIST with an UPSTREAM-TASK tag at the end specifying a bug number to track the task of upstreaming the change. Please also add the CrOSWiFi-PendingUpstreamReview hotlist to the task and add the patch to go/cros_supplicant_patches. For other changes, we prefer landing the change as UPSTREAM or BACKPORT to avoid accruing technical debt.
If you‘ve landed your change as FROMLIST, make sure to monitor the hostap mailing list so you can revise your patch if necessary. After it has been accepted upstream, revert the original FROMLIST patch and land it as UPSTREAM (or BACKPORT) to update the change to its latest version if necessary. There’s no need to do this if there is no diff between the UPSTREAM and FROMLIST patches. An easy way to do this is to run the following command:
diff <(git show ${FROMLIST_HASH}) <(git show ${UPSTREAM_HASH})
Note that there will always be diffs, but you can skip relanding as long as these diffs are part of the patch itself. Remember to close the task that was opened to track upstreaming, and remove the patch from go/cros_supplicant_patches.
For convenience, we suggest subscribing to the hostap mailing list so that your patches will be automatically posted to the list without approval. Note that DMARC restrictions may prevent subscribing to the mailing list with your @google.com email. Sending changes upstream is fairly similar to the kernel process. Follow those instructions to set up your git configuration and for best practices with respect to patch titling and formatting. Note that our wpa_supplicant repository already contains an upstream/main branch that you can use to make sure the patch applies cleanly upstream. Once you are ready to send your patch(es), you can send them to j@w1.fi (Jouni Malinen, the maintainer) and hostap@lists.infradead.org (the mailing list).