Re: [PATCH wireless-next] iwlwifi: iwlagn_request_scan: Fix check for NULL priv->scan_request
From: Johannes Berg <johannes@sipsolutions.net>
Date: 2012-12-06 21:41:40
Also in:
lkml, netdev
Possibly related (same subject, not in this thread)
- 2012-12-06 · [PATCH wireless-next] iwlwifi: iwlagn_request_scan: Fix check for NULL priv->scan_request · Tim Gardner <hidden>
quoted hunk
--- a/drivers/net/wireless/iwlwifi/dvm/scan.c +++ b/drivers/net/wireless/iwlwifi/dvm/scan.c@@ -673,8 +673,9 @@ static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) const u8 *ssid = NULL; u8 ssid_len = 0; - if (WARN_ON_ONCE(priv->scan_request && - priv->scan_request->n_channels > MAX_SCAN_CHANNEL)) + if (WARN_ON(priv->scan_type == IWL_SCAN_NORMAL && + (!priv->scan_request || + priv->scan_request->n_channels > MAX_SCAN_CHANNEL))) return -EINVAL;
I'll pick it up if you fix the indentation :P johannes