提交 babd3a27 编写于 作者: Z Zhao, Gang 提交者: Johannes Berg

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: NZhao, Gang <gamerh2o@gmail.com>
Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
上级 0c2bef46
...@@ -468,7 +468,7 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, ...@@ -468,7 +468,7 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev,
} }
wdev->conn->params.ssid = wdev->ssid; 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 */ /* see if we have the bss already */
bss = cfg80211_get_conn_bss(wdev); bss = cfg80211_get_conn_bss(wdev);
...@@ -480,7 +480,6 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, ...@@ -480,7 +480,6 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev,
/* we're good if we have a matching bss struct */ /* we're good if we have a matching bss struct */
if (bss) { if (bss) {
wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT;
err = cfg80211_conn_do_work(wdev); err = cfg80211_conn_do_work(wdev);
cfg80211_put_bss(wdev->wiphy, bss); cfg80211_put_bss(wdev->wiphy, bss);
} else { } else {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册