diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-17 13:32:20 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-17 13:32:20 -0500 |
| commit | b6a15802eee2dd8d401f5f89af31804f5a77f429 (patch) | |
| tree | 213e6db3ececae54a6c61ccfe256ac3513cc8a3b /net | |
| parent | bbf807bc0697e577c137a5fffb30fca7c6a45da1 (diff) | |
| parent | bd02cd2549cfcdfc57cb5ce57ffc3feb94f70575 (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/radiotap.c | 4 | ||||
| -rw-r--r-- | net/wireless/sme.c | 22 |
2 files changed, 16 insertions, 10 deletions
diff --git a/net/wireless/radiotap.c b/net/wireless/radiotap.c index a271c27fac77..722da616438c 100644 --- a/net/wireless/radiotap.c +++ b/net/wireless/radiotap.c | |||
| @@ -124,6 +124,10 @@ int ieee80211_radiotap_iterator_init( | |||
| 124 | /* find payload start allowing for extended bitmap(s) */ | 124 | /* find payload start allowing for extended bitmap(s) */ |
| 125 | 125 | ||
| 126 | if (iterator->_bitmap_shifter & (1<<IEEE80211_RADIOTAP_EXT)) { | 126 | if (iterator->_bitmap_shifter & (1<<IEEE80211_RADIOTAP_EXT)) { |
| 127 | if ((unsigned long)iterator->_arg - | ||
| 128 | (unsigned long)iterator->_rtheader + sizeof(uint32_t) > | ||
| 129 | (unsigned long)iterator->_max_length) | ||
| 130 | return -EINVAL; | ||
| 127 | while (get_unaligned_le32(iterator->_arg) & | 131 | while (get_unaligned_le32(iterator->_arg) & |
| 128 | (1 << IEEE80211_RADIOTAP_EXT)) { | 132 | (1 << IEEE80211_RADIOTAP_EXT)) { |
| 129 | iterator->_arg += sizeof(uint32_t); | 133 | iterator->_arg += sizeof(uint32_t); |
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 65f800890d70..d3c5bd7c6b51 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c | |||
| @@ -632,6 +632,16 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid, | |||
| 632 | } | 632 | } |
| 633 | #endif | 633 | #endif |
| 634 | 634 | ||
| 635 | if (!bss && (status == WLAN_STATUS_SUCCESS)) { | ||
| 636 | WARN_ON_ONCE(!wiphy_to_dev(wdev->wiphy)->ops->connect); | ||
| 637 | bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid, | ||
| 638 | wdev->ssid, wdev->ssid_len, | ||
| 639 | WLAN_CAPABILITY_ESS, | ||
| 640 | WLAN_CAPABILITY_ESS); | ||
| 641 | if (bss) | ||
| 642 | cfg80211_hold_bss(bss_from_pub(bss)); | ||
| 643 | } | ||
| 644 | |||
| 635 | if (wdev->current_bss) { | 645 | if (wdev->current_bss) { |
| 636 | cfg80211_unhold_bss(wdev->current_bss); | 646 | cfg80211_unhold_bss(wdev->current_bss); |
| 637 | cfg80211_put_bss(wdev->wiphy, &wdev->current_bss->pub); | 647 | cfg80211_put_bss(wdev->wiphy, &wdev->current_bss->pub); |
| @@ -649,16 +659,8 @@ void __cfg80211_connect_result(struct net_device *dev, const u8 *bssid, | |||
| 649 | return; | 659 | return; |
| 650 | } | 660 | } |
| 651 | 661 | ||
| 652 | if (!bss) { | 662 | if (WARN_ON(!bss)) |
| 653 | WARN_ON_ONCE(!wiphy_to_dev(wdev->wiphy)->ops->connect); | 663 | return; |
| 654 | bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid, | ||
| 655 | wdev->ssid, wdev->ssid_len, | ||
| 656 | WLAN_CAPABILITY_ESS, | ||
| 657 | WLAN_CAPABILITY_ESS); | ||
| 658 | if (WARN_ON(!bss)) | ||
| 659 | return; | ||
| 660 | cfg80211_hold_bss(bss_from_pub(bss)); | ||
| 661 | } | ||
| 662 | 664 | ||
| 663 | wdev->current_bss = bss_from_pub(bss); | 665 | wdev->current_bss = bss_from_pub(bss); |
| 664 | 666 | ||