From: Johannes Berg <johannes@sipsolutions.net>
To: Tim Gardner <tim.gardner@canonical.com>
Cc: linux-kernel@vger.kernel.org, Wey-Yi Guy <wey-yi.w.guy@intel.com>,
Intel Linux Wireless <ilw@linux.intel.com>,
"John W. Linville" <linville@tuxdriver.com>,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
Don Fry <donald.h.fry@intel.com>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH wireless-next] iwlwifi: iwlagn_request_scan: Fix check for NULL priv->scan_request
Date: Thu, 06 Dec 2012 22:41:54 +0100 [thread overview]
Message-ID: <1354830114.18211.4.camel@jlt4.sipsolutions.net> (raw)
In-Reply-To: <1354825445-79551-1-git-send-email-tim.gardner@canonical.com> (sfid-20121206_214912_422543_9C67DD48)
> --- 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
next prev parent reply other threads:[~2012-12-06 21:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-06 20:24 [PATCH wireless-next] iwlwifi: iwlagn_request_scan: Fix check for NULL priv->scan_request Tim Gardner
2012-12-06 21:41 ` Johannes Berg [this message]
2012-12-07 13:28 ` [PATCH V2 wireless-next] iwlwifi: iwlagn_request_scan: Fix check for priv->scan_request Tim Gardner
2012-12-07 16:05 ` Johannes Berg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1354830114.18211.4.camel@jlt4.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=donald.h.fry@intel.com \
--cc=emmanuel.grumbach@intel.com \
--cc=ilw@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
--cc=tim.gardner@canonical.com \
--cc=wey-yi.w.guy@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).