Re: [PATCH 09/10] cfg80211: remove WARN_ON in __cfg80211_sme_scan_done

Johannes Berg
2009-07-16T09:40:33Z

[-- Attachment #1: Type: text/plain, Size: 866 bytes --]

On Thu, 2009-07-16 at 17:34 +0800, Zhu Yi wrote:
> cfg80211_sme_scan_done() can be called (by fullmac cards) with
> wdev->conn == NULL when CFG80211_SME_CONNECTING. We quit silently
> instead of WARN_ON in this case.

Indeed, sorry.

Acked-by: Johannes Berg <johannes@sipsolutions.net>

> Signed-off-by: Zhu Yi <yi.zhu@intel.com>
> ---
> net/wireless/sme.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/net/wireless/sme.c b/net/wireless/sme.c
> index 10ed366..e7a8851 100644
> --- a/net/wireless/sme.c
> +++ b/net/wireless/sme.c
> @@ -227,7 +227,7 @@ static void __cfg80211_sme_scan_done(struct net_device *dev)
> if (wdev->sme_state != CFG80211_SME_CONNECTING)
> return;
>
> - if (WARN_ON(!wdev->conn))
> + if (!wdev->conn)
> return;
>
> if (wdev->conn->state != CFG80211_CONN_SCANNING &&

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]