summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorZhao, Gang <gamerh2o@gmail.com>2014-03-19 23:02:21 +0800
committerJohannes Berg <johannes.berg@intel.com>2014-04-09 10:55:31 +0200
commitbabd3a272123da5b9bc1da943fad74c581a9df6c (patch)
tree0f6538bfd12b83f95dccdd3f11c7005856f42302 /net
parent0c2bef4621c5feb5bda9068c9964b2e9acf57017 (diff)
downloadop-kernel-dev-babd3a272123da5b9bc1da943fad74c581a9df6c.zip
op-kernel-dev-babd3a272123da5b9bc1da943fad74c581a9df6c.tar.gz
cfg80211: slightly clean up of cfg80211_sme_connect()
Wdev->ssid_len has already been set in cfg80211_connect() and is equal to connect->ssid_len. Use wdev->ssid_len instead of connect->ssid_len so it will be consistent with previous ssid assignment statement. If bss is found in cfg80211_get_conn_bss(), wdev->conn->state is set to CFG80211_CONN_AUTHENTICATE_NEXT in there. So it's not needed to set it manually to CFG80211_CONN_AUTHENTICATE_NEXT if bss is found in that function. Signed-off-by: Zhao, Gang <gamerh2o@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/sme.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index acdcb4a8..998674f 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -468,7 +468,7 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev,
}
wdev->conn->params.ssid = wdev->ssid;
- wdev->conn->params.ssid_len = connect->ssid_len;
+ wdev->conn->params.ssid_len = wdev->ssid_len;
/* see if we have the bss already */
bss = cfg80211_get_conn_bss(wdev);
@@ -480,7 +480,6 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev,
/* 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(wdev->wiphy, bss);
} else {
OpenPOWER on IntegriCloud