> --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
