Merge lp://staging/~phablet-team/network-manager/wifi-fix-cancel-scan into lp://staging/~phablet-team/network-manager/vivid-phone-overlay

Proposed by Tony Espy
Status: Merged
Approved by: Alfonso Sanchez-Beato
Approved revision: 975
Merged at revision: 972
Proposed branch: lp://staging/~phablet-team/network-manager/wifi-fix-cancel-scan
Merge into: lp://staging/~phablet-team/network-manager/vivid-phone-overlay
Diff against target: 246 lines (+154/-13)
5 files modified
debian/changelog (+20/-0)
debian/patches/ignore_rfkill_if_urfkill_is_present.patch (+5/-5)
debian/patches/lp1099983_ignore-p2p-wifi-devices.patch (+9/-8)
debian/patches/series (+1/-0)
debian/patches/wifi-fix-cancel-scan.patch (+119/-0)
To merge this branch: bzr merge lp://staging/~phablet-team/network-manager/wifi-fix-cancel-scan
Reviewer Review Type Date Requested Status
Simon Fels Approve
Alfonso Sanchez-Beato Approve
Mathieu Trudel-Lapierre Pending
Review via email: mp+288440@code.staging.launchpad.net

Description of the change

This patch fixes a race condition in NMDeviceWiFi's scanning logic.
It's possible for cancel_pending_scan() to be called when an actual
supplicant scan is pending, which can cause scanning to stall,
effectively preventing the device from re-connecting to WiFi.

To post a comment you must log in.
973. By Tony Espy

* d/p/lp1099983_ignore-p2p-wifi-devices.patch: updated to ignore
  all p2p devices ( not just p2p0 ), as some drivers dynamically
  create differently named p2p devices which are managed externally
  in the case of WiFi Direct usage.
* d/p/lp1099983_ignore-p2p-wifi-devices.patch: refreshed

974. By Tony Espy

d/p/wifi-fix-cancel-scan.patch: add logic to supplicant_iface_state_cb
to schedule a scan if supplicant state becomes inactive, and
old_state was scanning.

975. By Tony Espy

d/p/wifi-fix-cancel-scan.patch: cancel_pending_scan, and use
request_wireless_scan instead of sched_scan to re-trigger scanning
logic when supplicant_state becomes inactive.

Revision history for this message
Alfonso Sanchez-Beato (alfonsosanchezbeato) wrote :

LGTM

review: Approve
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: