diff options
author | Dan Murphy | 2013-04-29 08:00:08 -0500 |
---|---|---|
committer | Dan Murphy | 2013-04-29 08:00:08 -0500 |
commit | a8aae67a2f939aaec81b901204a0bfd320692cfa (patch) | |
tree | abe4d6d5dc5f725d8e6e41985a7dc96dfbf57fc2 /net | |
parent | 76fbf612df49acd211375caae0f531a453d6a333 (diff) | |
parent | 8299a17a0544a45529a954cf27f9bf40e8890ac6 (diff) | |
download | kernel-video-a8aae67a2f939aaec81b901204a0bfd320692cfa.tar.gz kernel-video-a8aae67a2f939aaec81b901204a0bfd320692cfa.tar.xz kernel-video-a8aae67a2f939aaec81b901204a0bfd320692cfa.zip |
Merge tag 'v3.8.9' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-3.8.y
* tag 'v3.8.9' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (43 commits)
Linux 3.8.9
Revert "MIPS: page.h: Provide more readable definition for PAGE_MASK."
s390: move dummy io_remap_pfn_range() to asm/pgtable.h
Btrfs: make sure nbytes are right after log replay
vm: convert mtdchar mmap to vm_iomap_memory() helper
vm: convert HPET mmap to vm_iomap_memory() helper
vm: convert fb_mmap to vm_iomap_memory() helper
vm: convert snd_pcm_lib_mmap_iomem() to vm_iomap_memory() helper
vm: add vm_iomap_memory() helper function
userns: Changing any namespace id mappings should require privileges
userns: Check uid_map's opener's fsuid, not the current fsuid
userns: Don't let unprivileged users trick privileged users into setting the id_map
perf/x86: Fix offcore_rsp valid mask for SNB/IVB
perf: Treat attr.config as u64 in perf_swevent_init()
crypto: algif - suppress sending source address information in recvmsg
ssb: implement spurious tone avoidance
mac80211: fix cfg80211 interaction on auth/assoc request
ath9k_hw: change AR9580 initvals to fix a stability issue
ath9k_htc: accept 1.x firmware newer than 1.3
ARM: 7698/1: perf: fix group validation when using enable_on_exec
...
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/mlme.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 2c6e4788dde..cbce371c23d 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -3745,8 +3745,16 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, | |||
3745 | /* prep auth_data so we don't go into idle on disassoc */ | 3745 | /* prep auth_data so we don't go into idle on disassoc */ |
3746 | ifmgd->auth_data = auth_data; | 3746 | ifmgd->auth_data = auth_data; |
3747 | 3747 | ||
3748 | if (ifmgd->associated) | 3748 | if (ifmgd->associated) { |
3749 | ieee80211_set_disassoc(sdata, 0, 0, false, NULL); | 3749 | u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN]; |
3750 | |||
3751 | ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, | ||
3752 | WLAN_REASON_UNSPECIFIED, | ||
3753 | false, frame_buf); | ||
3754 | |||
3755 | __cfg80211_send_deauth(sdata->dev, frame_buf, | ||
3756 | sizeof(frame_buf)); | ||
3757 | } | ||
3750 | 3758 | ||
3751 | sdata_info(sdata, "authenticate with %pM\n", req->bss->bssid); | 3759 | sdata_info(sdata, "authenticate with %pM\n", req->bss->bssid); |
3752 | 3760 | ||
@@ -3805,8 +3813,16 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, | |||
3805 | 3813 | ||
3806 | mutex_lock(&ifmgd->mtx); | 3814 | mutex_lock(&ifmgd->mtx); |
3807 | 3815 | ||
3808 | if (ifmgd->associated) | 3816 | if (ifmgd->associated) { |
3809 | ieee80211_set_disassoc(sdata, 0, 0, false, NULL); | 3817 | u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN]; |
3818 | |||
3819 | ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, | ||
3820 | WLAN_REASON_UNSPECIFIED, | ||
3821 | false, frame_buf); | ||
3822 | |||
3823 | __cfg80211_send_deauth(sdata->dev, frame_buf, | ||
3824 | sizeof(frame_buf)); | ||
3825 | } | ||
3810 | 3826 | ||
3811 | if (ifmgd->auth_data && !ifmgd->auth_data->done) { | 3827 | if (ifmgd->auth_data && !ifmgd->auth_data->done) { |
3812 | err = -EBUSY; | 3828 | err = -EBUSY; |