From patchwork Wed Sep 16 04:39:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 47816 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 n8G4evh8013171 for ; Wed, 16 Sep 2009 04:40:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750845AbZIPEjp (ORCPT ); Wed, 16 Sep 2009 00:39:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750759AbZIPEjp (ORCPT ); Wed, 16 Sep 2009 00:39:45 -0400 Received: from xc.sipsolutions.net ([83.246.72.84]:46762 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750727AbZIPEjp (ORCPT ); Wed, 16 Sep 2009 00:39:45 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1MnmIw-0004c5-Cp; Wed, 16 Sep 2009 06:39:43 +0200 Subject: Re: [PATCH] cfg80211: don't report SME connection errs at SIOCSIW{FREQ/AP/ESSID} From: Johannes Berg To: Holger Schurig Cc: linux-wireless , John W Linville In-Reply-To: <200909150821.57216.hs4233@mail.mn-solutions.de> References: <200909141254.14988.hs4233@mail.mn-solutions.de> <200909141323.44245.hs4233@mail.mn-solutions.de> <1252950234.23427.51.camel@johannes.local> <200909150821.57216.hs4233@mail.mn-solutions.de> Date: Tue, 15 Sep 2009 21:39:07 -0700 Message-Id: <1253075947.9450.0.camel@johannes.local> Mime-Version: 1.0 X-Mailer: Evolution 2.27.92 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Tue, 2009-09-15 at 08:21 +0200, Holger Schurig wrote: > > And doesn't look correct to me at all. probably something > > missing wrt. disconnect() while connecting. > > Can you then outline the right solution ? Try this please. johannes Tested-by: Holger Schurig --- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- wireless-testing.orig/net/wireless/sme.c 2009-09-15 21:33:41.000000000 -0700 +++ wireless-testing/net/wireless/sme.c 2009-09-15 21:37:58.000000000 -0700 @@ -188,7 +188,7 @@ void cfg80211_conn_work(struct work_stru rtnl_unlock(); } -static bool cfg80211_get_conn_bss(struct wireless_dev *wdev) +static struct cfg80211_bss *cfg80211_get_conn_bss(struct wireless_dev *wdev) { struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); struct cfg80211_bss *bss; @@ -205,7 +205,7 @@ static bool cfg80211_get_conn_bss(struct WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_PRIVACY, capa); if (!bss) - return false; + return NULL; memcpy(wdev->conn->bssid, bss->bssid, ETH_ALEN); wdev->conn->params.bssid = wdev->conn->bssid; @@ -213,14 +213,14 @@ static bool cfg80211_get_conn_bss(struct wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT; schedule_work(&rdev->conn_work); - cfg80211_put_bss(bss); - return true; + return bss; } static void __cfg80211_sme_scan_done(struct net_device *dev) { struct wireless_dev *wdev = dev->ieee80211_ptr; struct cfg80211_registered_device *rdev = wiphy_to_dev(wdev->wiphy); + struct cfg80211_bss *bss; ASSERT_WDEV_LOCK(wdev); @@ -234,7 +234,10 @@ static void __cfg80211_sme_scan_done(str wdev->conn->state != CFG80211_CONN_SCAN_AGAIN) return; - if (!cfg80211_get_conn_bss(wdev)) { + bss = cfg80211_get_conn_bss(wdev); + if (bss) { + cfg80211_put_bss(bss); + } else { /* not found */ if (wdev->conn->state == CFG80211_CONN_SCAN_AGAIN) schedule_work(&rdev->conn_work); @@ -670,6 +673,7 @@ int __cfg80211_connect(struct cfg80211_r { struct wireless_dev *wdev = dev->ieee80211_ptr; struct ieee80211_channel *chan; + struct cfg80211_bss *bss = NULL; int err; ASSERT_WDEV_LOCK(wdev); @@ -760,7 +764,7 @@ int __cfg80211_connect(struct cfg80211_r /* don't care about result -- but fill bssid & channel */ if (!wdev->conn->params.bssid || !wdev->conn->params.channel) - cfg80211_get_conn_bss(wdev); + bss = cfg80211_get_conn_bss(wdev); wdev->sme_state = CFG80211_SME_CONNECTING; wdev->connect_keys = connkeys; @@ -770,10 +774,11 @@ int __cfg80211_connect(struct cfg80211_r wdev->conn->prev_bssid_valid = true; } - /* we're good if we have both BSSID and channel */ - if (wdev->conn->params.bssid && wdev->conn->params.channel) { + /* we're good if we have a matching bss struct */ + if (bss) { wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT; err = cfg80211_conn_do_work(wdev); + cfg80211_put_bss(bss); } else { /* otherwise we'll need to scan for the AP first */ err = cfg80211_conn_scan(wdev);