From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org>
Subject: [PATCH] cfg80211: fix two buglets
Date: Tue, 07 Jul 2009 23:46:51 +0200 [thread overview]
Message-ID: <1247003211.4755.54.camel@johannes.local> (raw)
This fixes two small bugs:
1) the connect variable is already initialised, and the
assignment to auth_type overwrites the previous setting
with a wrong value
2) when all authentication attempts fail, we need to report
that we couldn't connect
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
net/wireless/nl80211.c | 4 ----
net/wireless/sme.c | 5 ++---
2 files changed, 2 insertions(+), 7 deletions(-)
--- wireless-testing.orig/net/wireless/nl80211.c 2009-07-07 23:39:04.000000000 +0200
+++ wireless-testing/net/wireless/nl80211.c 2009-07-07 23:39:05.000000000 +0200
@@ -3695,10 +3695,6 @@ static int nl80211_connect(struct sk_buf
wiphy = &rdev->wiphy;
- connect.bssid = NULL;
- connect.channel = NULL;
- connect.auth_type = NL80211_AUTHTYPE_OPEN_SYSTEM;
-
if (info->attrs[NL80211_ATTR_MAC])
connect.bssid = nla_data(info->attrs[NL80211_ATTR_MAC]);
connect.ssid = nla_data(info->attrs[NL80211_ATTR_SSID]);
--- wireless-testing.orig/net/wireless/sme.c 2009-07-07 23:39:01.000000000 +0200
+++ wireless-testing/net/wireless/sme.c 2009-07-07 23:39:05.000000000 +0200
@@ -296,9 +296,8 @@ void cfg80211_sme_rx_auth(struct net_dev
wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT;
schedule_work(&rdev->conn_work);
} else if (status_code != WLAN_STATUS_SUCCESS) {
- wdev->sme_state = CFG80211_SME_IDLE;
- kfree(wdev->conn);
- wdev->conn = NULL;
+ __cfg80211_connect_result(dev, mgmt->bssid, NULL, 0, NULL, 0,
+ status_code, false);
} else if (wdev->sme_state == CFG80211_SME_CONNECTING &&
wdev->conn->state == CFG80211_CONN_AUTHENTICATING) {
wdev->conn->state = CFG80211_CONN_ASSOCIATE_NEXT;
reply other threads:[~2009-07-07 21:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1247003211.4755.54.camel@johannes.local \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.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