From patchwork Tue Oct 13 11:45:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Schurig X-Patchwork-Id: 53389 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9DBv4M8011419 for ; Tue, 13 Oct 2009 11:57:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759535AbZJMLqu (ORCPT ); Tue, 13 Oct 2009 07:46:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759534AbZJMLqu (ORCPT ); Tue, 13 Oct 2009 07:46:50 -0400 Received: from mx51.mymxserver.com ([85.199.173.110]:51220 "EHLO mx51.mymxserver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759525AbZJMLqt (ORCPT ); Tue, 13 Oct 2009 07:46:49 -0400 Received: from localhost (localhost [127.0.0.1]) by localhost.mx51.mymxserver.com (Postfix) with ESMTP id 3B4CB148010; Tue, 13 Oct 2009 13:45:42 +0200 (CEST) X-Virus-Scanned: by Mittwald Mailscanner Received: from mx51.mymxserver.com ([127.0.0.1]) by localhost (mx51.mymxserver.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tXmw+c3L2MP2; Tue, 13 Oct 2009 13:45:42 +0200 (CEST) Received: from lin01.mn-solutions.de (pD95FA59B.dip0.t-ipconnect.de [217.95.165.155]) by mx51.mymxserver.com (Postfix) with ESMTP id E1ACB14800F; Tue, 13 Oct 2009 13:45:40 +0200 (CEST) Received: by lin01.mn-solutions.de (Postfix, from userid 116) id 36A391E0050; Tue, 13 Oct 2009 13:45:40 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.1.7-deb3 (2006-10-05) on lin01.mn-logistik.de X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.7-deb3 Received: from mnz66.mn-solutions.de (mnz66.mn-solutions.de [192.168.233.66]) by lin01.mn-solutions.de (Postfix) with ESMTP id C621A1E0010; Tue, 13 Oct 2009 13:45:30 +0200 (CEST) From: Holger Schurig To: linux-wireless , "John W. Linville" Subject: [PATCH] cfg80211: remove warning in deauth case Date: Tue, 13 Oct 2009 13:45:28 +0200 User-Agent: KMail/1.9.7 Cc: Johannes Berg MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200910131345.28395.hs4233@mail.mn-solutions.de> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org --- linux-wl.orig/net/wireless/mlme.c +++ linux-wl/net/wireless/mlme.c @@ -130,7 +130,6 @@ struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf; const u8 *bssid = mgmt->bssid; int i; - bool done = false; ASSERT_WDEV_LOCK(wdev); @@ -138,7 +137,6 @@ if (wdev->current_bss && memcmp(wdev->current_bss->pub.bssid, bssid, ETH_ALEN) == 0) { - done = true; cfg80211_unhold_bss(wdev->current_bss); cfg80211_put_bss(&wdev->current_bss->pub); wdev->current_bss = NULL; @@ -148,7 +146,6 @@ cfg80211_unhold_bss(wdev->auth_bsses[i]); cfg80211_put_bss(&wdev->auth_bsses[i]->pub); wdev->auth_bsses[i] = NULL; - done = true; break; } if (wdev->authtry_bsses[i] && @@ -156,13 +153,10 @@ cfg80211_unhold_bss(wdev->authtry_bsses[i]); cfg80211_put_bss(&wdev->authtry_bsses[i]->pub); wdev->authtry_bsses[i] = NULL; - done = true; break; } } - WARN_ON(!done); - if (wdev->sme_state == CFG80211_SME_CONNECTED) { u16 reason_code; bool from_ap;