Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cd17638 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

parents bc27d5f1 d012a605

drivers/net/ethernet/toshiba/ps3_gelic_wireless.c

+2 −2
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static size_t gelic_wl_synthesize_ie(u8 *buf, 
	if (rsn)

		*buf++ = WLAN_EID_RSN;

	else

		*buf++ = WLAN_EID_GENERIC;

		*buf++ = WLAN_EID_VENDOR_SPECIFIC;



	/* length filed; set later */

	buf++;
@@ -540,7 +540,7 @@ static void gelic_wl_parse_ie(u8 *data, size_t len, 
			break;



		switch (item_id) {

		case WLAN_EID_GENERIC:

		case WLAN_EID_VENDOR_SPECIFIC:

			if ((OUI_LEN + 1 <= item_len) &&

			    !memcmp(pos, wpa_oui, OUI_LEN) &&

			    pos[OUI_LEN] == 0x01) {

drivers/net/wireless/airo.c

+1 −1
Original line number Diff line number Diff line
@@ -7433,7 +7433,7 @@ static inline char *airo_translate_scan(struct net_device *dev, 
					num_null_ies++;

				break;



			case WLAN_EID_GENERIC:

			case WLAN_EID_VENDOR_SPECIFIC:

				if (ie[1] >= 4 &&

				    ie[2] == 0x00 &&

				    ie[3] == 0x50 &&

drivers/net/wireless/ath/ath6kl/cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ static bool ath6kl_cfg80211_ready(struct ath6kl_vif *vif) 


static bool ath6kl_is_wpa_ie(const u8 *pos)

{

	return pos[0] == WLAN_EID_WPA && pos[1] >= 4 &&

	return pos[0] == WLAN_EID_VENDOR_SPECIFIC && pos[1] >= 4 &&

		pos[2] == 0x00 && pos[3] == 0x50 &&

		pos[4] == 0xf2 && pos[5] == 0x01;

}
@@ -3651,7 +3651,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar) 


	if (test_bit(ATH6KL_FW_CAPABILITY_INACTIVITY_TIMEOUT,

		     ar->fw_capabilities))

		ar->wiphy->features = NL80211_FEATURE_INACTIVITY_TIMER;

		ar->wiphy->features |= NL80211_FEATURE_INACTIVITY_TIMER;



	ar->wiphy->probe_resp_offload =

		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -2679,7 +2679,7 @@ brcmf_find_wpaie(u8 *parse, u32 len) 
{

	struct brcmf_tlv *ie;



	while ((ie = brcmf_parse_tlvs(parse, len, WLAN_EID_WPA))) {

	while ((ie = brcmf_parse_tlvs(parse, len, WLAN_EID_VENDOR_SPECIFIC))) {

		if (brcmf_tlv_has_ie((u8 *)ie, &parse, &len,

				     WPA_OUI, TLV_OUI_LEN, WPA_OUI_TYPE))

			return (struct brcmf_vs_tlv *)ie;

drivers/net/wireless/hostap/hostap_80211_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static void hostap_rx_sta_beacon(local_info_t *local, struct sk_buff *skb, 
			ssid = pos + 2;

			ssid_len = pos[1];

			break;

		case WLAN_EID_GENERIC:

		case WLAN_EID_VENDOR_SPECIFIC:

			if (pos[1] >= 4 &&

			    pos[2] == 0x00 && pos[3] == 0x50 &&

			    pos[4] == 0xf2 && pos[5] == 1) {