diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2022-06-01 22:42:28 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2022-06-20 12:55:48 +0200 |
| commit | 325839da9581ee3e881e9c318cbebbdd680cb101 (patch) | |
| tree | 13d21d116f75904ac4ce871c6b283ac6f6eebdfb /net/wireless/sme.c | |
| parent | 0f48b8b88aa9ed7b65d7cb55dbc57ec914ddada1 (diff) | |
| download | linux-325839da9581ee3e881e9c318cbebbdd680cb101.tar.gz linux-325839da9581ee3e881e9c318cbebbdd680cb101.tar.bz2 linux-325839da9581ee3e881e9c318cbebbdd680cb101.zip | |
wifi: cfg80211: simplify cfg80211_mlme_auth() prototype
This function has far too many parameters now, move out
the BSS lookup and pass the request struct instead.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/sme.c')
| -rw-r--r-- | net/wireless/sme.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index c869152629b6..c8a99b90723b 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -147,6 +147,7 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev, { struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy); struct cfg80211_connect_params *params; + struct cfg80211_auth_request auth_req = {}; struct cfg80211_assoc_request req = {}; int err; @@ -167,13 +168,18 @@ static int cfg80211_conn_do_work(struct wireless_dev *wdev, if (WARN_ON(!rdev->ops->auth)) return -EOPNOTSUPP; wdev->conn->state = CFG80211_CONN_AUTHENTICATING; - return cfg80211_mlme_auth(rdev, wdev->netdev, - params->channel, params->auth_type, - params->bssid, - params->ssid, params->ssid_len, - NULL, 0, - params->key, params->key_len, - params->key_idx, NULL, 0); + auth_req.key = params->key; + auth_req.key_len = params->key_len; + auth_req.key_idx = params->key_idx; + auth_req.auth_type = params->auth_type; + auth_req.bss = cfg80211_get_bss(&rdev->wiphy, params->channel, + params->bssid, + params->ssid, params->ssid_len, + IEEE80211_BSS_TYPE_ESS, + IEEE80211_PRIVACY_ANY); + err = cfg80211_mlme_auth(rdev, wdev->netdev, &auth_req); + cfg80211_put_bss(&rdev->wiphy, auth_req.bss); + return err; case CFG80211_CONN_AUTH_FAILED_TIMEOUT: *treason = NL80211_TIMEOUT_AUTH; return -ENOTCONN; |