diff options
Diffstat (limited to 'net/mac80211/ieee80211_sta.c')
-rw-r--r-- | net/mac80211/ieee80211_sta.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index 22b11786327a..7ba352e3ffe0 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 | ||
@@ -2106,12 +2105,9 @@ static int ieee80211_sta_config_auth(struct net_device *dev, | |||
2106 | struct ieee80211_sta_bss *bss, *selected = NULL; | 2105 | struct ieee80211_sta_bss *bss, *selected = NULL; |
2107 | int top_rssi = 0, freq; | 2106 | int top_rssi = 0, freq; |
2108 | 2107 | ||
2109 | rtnl_lock(); | ||
2110 | |||
2111 | if (!ifsta->auto_channel_sel && !ifsta->auto_bssid_sel && | 2108 | if (!ifsta->auto_channel_sel && !ifsta->auto_bssid_sel && |
2112 | !ifsta->auto_ssid_sel) { | 2109 | !ifsta->auto_ssid_sel) { |
2113 | ifsta->state = IEEE80211_AUTHENTICATE; | 2110 | ifsta->state = IEEE80211_AUTHENTICATE; |
2114 | rtnl_unlock(); | ||
2115 | ieee80211_sta_reset_auth(dev, ifsta); | 2111 | ieee80211_sta_reset_auth(dev, ifsta); |
2116 | return 0; | 2112 | return 0; |
2117 | } | 2113 | } |
@@ -2154,7 +2150,6 @@ static int ieee80211_sta_config_auth(struct net_device *dev, | |||
2154 | ieee80211_sta_set_bssid(dev, selected->bssid); | 2150 | ieee80211_sta_set_bssid(dev, selected->bssid); |
2155 | ieee80211_rx_bss_put(dev, selected); | 2151 | ieee80211_rx_bss_put(dev, selected); |
2156 | ifsta->state = IEEE80211_AUTHENTICATE; | 2152 | ifsta->state = IEEE80211_AUTHENTICATE; |
2157 | rtnl_unlock(); | ||
2158 | ieee80211_sta_reset_auth(dev, ifsta); | 2153 | ieee80211_sta_reset_auth(dev, ifsta); |
2159 | return 0; | 2154 | return 0; |
2160 | } else { | 2155 | } else { |
@@ -2165,7 +2160,6 @@ static int ieee80211_sta_config_auth(struct net_device *dev, | |||
2165 | } else | 2160 | } else |
2166 | ifsta->state = IEEE80211_DISABLED; | 2161 | ifsta->state = IEEE80211_DISABLED; |
2167 | } | 2162 | } |
2168 | rtnl_unlock(); | ||
2169 | return -1; | 2163 | return -1; |
2170 | } | 2164 | } |
2171 | 2165 | ||