aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/ieee80211_sta.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
index ba2bf8f0a347..952d8dd0676c 100644
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/ieee80211_sta.c
@@ -25,7 +25,6 @@
25#include <linux/wireless.h> 25#include <linux/wireless.h>
26#include <linux/random.h> 26#include <linux/random.h>
27#include <linux/etherdevice.h> 27#include <linux/etherdevice.h>
28#include <linux/rtnetlink.h>
29#include <net/iw_handler.h> 28#include <net/iw_handler.h>
30#include <asm/types.h> 29#include <asm/types.h>
31 30
@@ -2107,12 +2106,9 @@ static int ieee80211_sta_config_auth(struct net_device *dev,
2107 struct ieee80211_sta_bss *bss, *selected = NULL; 2106 struct ieee80211_sta_bss *bss, *selected = NULL;
2108 int top_rssi = 0, freq; 2107 int top_rssi = 0, freq;
2109 2108
2110 rtnl_lock();
2111
2112 if (!ifsta->auto_channel_sel && !ifsta->auto_bssid_sel && 2109 if (!ifsta->auto_channel_sel && !ifsta->auto_bssid_sel &&
2113 !ifsta->auto_ssid_sel) { 2110 !ifsta->auto_ssid_sel) {
2114 ifsta->state = IEEE80211_AUTHENTICATE; 2111 ifsta->state = IEEE80211_AUTHENTICATE;
2115 rtnl_unlock();
2116 ieee80211_sta_reset_auth(dev, ifsta); 2112 ieee80211_sta_reset_auth(dev, ifsta);
2117 return 0; 2113 return 0;
2118 } 2114 }
@@ -2155,7 +2151,6 @@ static int ieee80211_sta_config_auth(struct net_device *dev,
2155 ieee80211_sta_set_bssid(dev, selected->bssid); 2151 ieee80211_sta_set_bssid(dev, selected->bssid);
2156 ieee80211_rx_bss_put(dev, selected); 2152 ieee80211_rx_bss_put(dev, selected);
2157 ifsta->state = IEEE80211_AUTHENTICATE; 2153 ifsta->state = IEEE80211_AUTHENTICATE;
2158 rtnl_unlock();
2159 ieee80211_sta_reset_auth(dev, ifsta); 2154 ieee80211_sta_reset_auth(dev, ifsta);
2160 return 0; 2155 return 0;
2161 } else { 2156 } else {
@@ -2166,7 +2161,6 @@ static int ieee80211_sta_config_auth(struct net_device *dev,
2166 } else 2161 } else
2167 ifsta->state = IEEE80211_DISABLED; 2162 ifsta->state = IEEE80211_DISABLED;
2168 } 2163 }
2169 rtnl_unlock();
2170 return -1; 2164 return -1;
2171} 2165}
2172 2166