Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 (b6a15802) · Commits · e / devices / android_kernel_xiaomi_nabu

net/wireless/radiotap.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,10 @@ int ieee80211_radiotap_iterator_init(
		/* find payload start allowing for extended bitmap(s) */

		if (iterator->_bitmap_shifter & (1<<IEEE80211_RADIOTAP_EXT)) {
		if ((unsigned long)iterator->_arg -
		(unsigned long)iterator->_rtheader + sizeof(uint32_t) >
		(unsigned long)iterator->_max_length)
		return -EINVAL;
		while (get_unaligned_le32(iterator->_arg) &
		(1 << IEEE80211_RADIOTAP_EXT)) {
		iterator->_arg += sizeof(uint32_t);

+12 −10

Original line number	Diff line number	Diff line
		@@ -632,6 +632,16 @@ void __cfg80211_connect_result(struct net_device dev, const u8 bssid,
		}
		#endif

		if (!bss && (status == WLAN_STATUS_SUCCESS)) {
		WARN_ON_ONCE(!wiphy_to_dev(wdev->wiphy)->ops->connect);
		bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
		wdev->ssid, wdev->ssid_len,
		WLAN_CAPABILITY_ESS,
		WLAN_CAPABILITY_ESS);
		if (bss)
		cfg80211_hold_bss(bss_from_pub(bss));
		}

		if (wdev->current_bss) {
		cfg80211_unhold_bss(wdev->current_bss);
		cfg80211_put_bss(wdev->wiphy, &wdev->current_bss->pub);
		@@ -649,16 +659,8 @@ void __cfg80211_connect_result(struct net_device dev, const u8 bssid,
		return;
		}

		if (!bss) {
		WARN_ON_ONCE(!wiphy_to_dev(wdev->wiphy)->ops->connect);
		bss = cfg80211_get_bss(wdev->wiphy, NULL, bssid,
		wdev->ssid, wdev->ssid_len,
		WLAN_CAPABILITY_ESS,
		WLAN_CAPABILITY_ESS);
		if (WARN_ON(!bss))
		return;
		cfg80211_hold_bss(bss_from_pub(bss));
		}

		wdev->current_bss = bss_from_pub(bss);