diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-07-07 17:46:51 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-24 15:05:06 -0400 |
commit | 4bde0f7d1dca0a7d886997eb8dee3fb47a6484e4 (patch) | |
tree | 81d9b826c357200fe054ff31e6199235524789d6 /net/wireless/nl80211.c | |
parent | a71d62dbf3f0523b7a456333196cb26cf783fe92 (diff) |
cfg80211: fix two buglets
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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/nl80211.c')
-rw-r--r-- | net/wireless/nl80211.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 4478760b7dc3..a00fd644370b 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
@@ -3680,10 +3680,6 @@ static int nl80211_connect(struct sk_buff *skb, struct genl_info *info) | |||
3680 | 3680 | ||
3681 | wiphy = &rdev->wiphy; | 3681 | wiphy = &rdev->wiphy; |
3682 | 3682 | ||
3683 | connect.bssid = NULL; | ||
3684 | connect.channel = NULL; | ||
3685 | connect.auth_type = NL80211_AUTHTYPE_OPEN_SYSTEM; | ||
3686 | |||
3687 | if (info->attrs[NL80211_ATTR_MAC]) | 3683 | if (info->attrs[NL80211_ATTR_MAC]) |
3688 | connect.bssid = nla_data(info->attrs[NL80211_ATTR_MAC]); | 3684 | connect.bssid = nla_data(info->attrs[NL80211_ATTR_MAC]); |
3689 | connect.ssid = nla_data(info->attrs[NL80211_ATTR_SSID]); | 3685 | connect.ssid = nla_data(info->attrs[NL80211_ATTR_SSID]); |