diff options
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 9e6c75abc922..708eb4502ed7 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -2416,7 +2416,6 @@ void ieee80211_sta_req_auth(struct ieee80211_sub_if_data *sdata, | |||
2416 | int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len) | 2416 | int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size_t len) |
2417 | { | 2417 | { |
2418 | struct ieee80211_if_sta *ifsta; | 2418 | struct ieee80211_if_sta *ifsta; |
2419 | int res; | ||
2420 | 2419 | ||
2421 | if (len > IEEE80211_MAX_SSID_LEN) | 2420 | if (len > IEEE80211_MAX_SSID_LEN) |
2422 | return -EINVAL; | 2421 | return -EINVAL; |
@@ -2428,19 +2427,6 @@ int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size | |||
2428 | memcpy(ifsta->ssid, ssid, len); | 2427 | memcpy(ifsta->ssid, ssid, len); |
2429 | ifsta->ssid_len = len; | 2428 | ifsta->ssid_len = len; |
2430 | ifsta->flags &= ~IEEE80211_STA_PREV_BSSID_SET; | 2429 | ifsta->flags &= ~IEEE80211_STA_PREV_BSSID_SET; |
2431 | |||
2432 | res = 0; | ||
2433 | /* | ||
2434 | * Hack! MLME code needs to be cleaned up to have different | ||
2435 | * entry points for configuration and internal selection change | ||
2436 | */ | ||
2437 | if (netif_running(sdata->dev)) | ||
2438 | res = ieee80211_if_config(sdata, IEEE80211_IFCC_SSID); | ||
2439 | if (res) { | ||
2440 | printk(KERN_DEBUG "%s: Failed to config new SSID to " | ||
2441 | "the low-level driver\n", sdata->dev->name); | ||
2442 | return res; | ||
2443 | } | ||
2444 | } | 2430 | } |
2445 | 2431 | ||
2446 | if (len) | 2432 | if (len) |