bes2600: take pending_record_lock with _bh() — fix SOFTIRQ-safe → -unsafe inversion (closes besser#18) #11
@@ -238,6 +238,28 @@ int bes2600_hw_scan(struct ieee80211_hw *hw,
|
||||
/* Scan when P2P_GO corrupt firmware MiniAP mode */
|
||||
if (priv->join_status == BES2600_JOIN_STATUS_AP)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
/*
|
||||
* Firmware refuses WSM start-scan for 5 GHz with status 2 ("rejected
|
||||
* by policy"); see besser issue #1. mac80211 splits multi-band
|
||||
* hw_scan requests per-band when the driver does not set
|
||||
* IEEE80211_HW_SINGLE_SCAN_ON_ALL_BANDS (we don't -- see
|
||||
* ieee80211_hw_set() calls in bes2600_main.c), so each per-band call
|
||||
* has req->channels[] from one band only (see ieee80211_prep_hw_scan
|
||||
* in net/mac80211/scan.c). Refuse the 5 GHz iteration at the driver
|
||||
* boundary so userspace gets a clean aborted-scan for that portion
|
||||
* rather than waiting for the firmware reject to cascade up. 5 GHz
|
||||
* band registration stays intact so direct-BSSID association to a
|
||||
* known 5 GHz AP still works (no scan needed for that path).
|
||||
*
|
||||
* Contract: per include/net/mac80211.h struct ieee80211_ops.hw_scan
|
||||
* documentation, a negative return aborts the scan without requiring
|
||||
* ieee80211_scan_completed().
|
||||
*/
|
||||
if (req->n_channels > 0 &&
|
||||
req->channels[0]->band == NL80211_BAND_5GHZ)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
#if 0
|
||||
if (work_pending(&priv->offchannel_work) ||
|
||||
(hw_priv->roc_if_id != -1)) {
|
||||
|
||||
Reference in New Issue
Block a user