diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-17 12:11:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-17 12:11:52 -0500 |
| commit | 4144cb2ade46d97b9c41682fd2e9064a59f23a98 (patch) | |
| tree | 4b5ef937b4d0dcede6b1669f03c3b6dccf57d5bc /net/mac80211/cfg.c | |
| parent | 59f608d84f937cb5e2fd3a0b9f848f200d47ba85 (diff) | |
| parent | 604c4ef1c453a1b2ea2cdf04d2b49afec421ebfa (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/cfg.c')
| -rw-r--r-- | net/mac80211/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index e60df48fa4d4..296620d6ca0c 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
| @@ -791,7 +791,7 @@ static int sta_apply_parameters(struct ieee80211_local *local, | |||
| 791 | if (set & BIT(NL80211_STA_FLAG_AUTHORIZED)) | 791 | if (set & BIT(NL80211_STA_FLAG_AUTHORIZED)) |
| 792 | ret = sta_info_move_state_checked(sta, | 792 | ret = sta_info_move_state_checked(sta, |
| 793 | IEEE80211_STA_AUTHORIZED); | 793 | IEEE80211_STA_AUTHORIZED); |
| 794 | else | 794 | else if (test_sta_flag(sta, WLAN_STA_AUTHORIZED)) |
| 795 | ret = sta_info_move_state_checked(sta, | 795 | ret = sta_info_move_state_checked(sta, |
| 796 | IEEE80211_STA_ASSOC); | 796 | IEEE80211_STA_ASSOC); |
| 797 | if (ret) | 797 | if (ret) |