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

drivers/net/wireless/libertas/cfg.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -298,6 +298,7 @@ static int lbs_add_common_rates_tlv(u8 tlv, struct cfg80211_bss bss)
		const u8 rates_eid, ext_rates_eid;
		int n = 0;

		rcu_read_lock();
		rates_eid = ieee80211_bss_get_ie(bss, WLAN_EID_SUPP_RATES);
		ext_rates_eid = ieee80211_bss_get_ie(bss, WLAN_EID_EXT_SUPP_RATES);

		@@ -325,6 +326,7 @@ static int lbs_add_common_rates_tlv(u8 tlv, struct cfg80211_bss bss)
		*tlv++ = 0x96;
		n = 4;
		}
		rcu_read_unlock();

		rate_tlv->header.len = cpu_to_le16(n);
		return sizeof(rate_tlv->header) + n;
		@@ -1140,11 +1142,13 @@ static int lbs_associate(struct lbs_private *priv,
		cmd->capability = cpu_to_le16(bss->capability);

		/* add SSID TLV */
		rcu_read_lock();
		ssid_eid = ieee80211_bss_get_ie(bss, WLAN_EID_SSID);
		if (ssid_eid)
		pos += lbs_add_ssid_tlv(pos, ssid_eid + 2, ssid_eid[1]);
		else
		lbs_deb_assoc("no SSID\n");
		rcu_read_unlock();

		/* add DS param TLV */
		if (bss->channel)
		@@ -1782,7 +1786,7 @@ static int lbs_ibss_join_existing(struct lbs_private *priv,
		struct cfg80211_ibss_params *params,
		struct cfg80211_bss *bss)
		{
		const u8 *rates_eid = ieee80211_bss_get_ie(bss, WLAN_EID_SUPP_RATES);
		const u8 *rates_eid;
		struct cmd_ds_802_11_ad_hoc_join cmd;
		u8 preamble = RADIO_PREAMBLE_SHORT;
		int ret = 0;
		@@ -1841,6 +1845,8 @@ static int lbs_ibss_join_existing(struct lbs_private *priv,

		/* set rates to the intersection of our rates and the rates in the
		bss */
		rcu_read_lock();
		rates_eid = ieee80211_bss_get_ie(bss, WLAN_EID_SUPP_RATES);
		if (!rates_eid) {
		lbs_add_rates(cmd.bss.rates);
		} else {
		@@ -1860,6 +1866,7 @@ static int lbs_ibss_join_existing(struct lbs_private *priv,
		}
		}
		}
		rcu_read_unlock();

		/* Only v8 and below support setting this */
		if (MRVL_FW_MAJOR_REV(priv->fwrelease) <= 8) {

drivers/net/wireless/mac80211_hwsim.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -1347,9 +1347,14 @@ static void hw_scan_work(struct work_struct *work)
		hwsim->hw_scan_vif,
		req->ssids[i].ssid,
		req->ssids[i].ssid_len,
		req->ie, req->ie_len);
		req->ie_len);
		if (!probe)
		continue;

		if (req->ie_len)
		memcpy(skb_put(probe, req->ie_len), req->ie,
		req->ie_len);

		local_bh_disable();
		mac80211_hwsim_tx_frame(hwsim->hw, probe,
		hwsim->tmp_chan);

drivers/net/wireless/mwifiex/sta_ioctl.c

+25 −8

Original line number	Diff line number	Diff line
		@@ -160,11 +160,21 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
		{
		int ret;
		u8 *beacon_ie;
		size_t beacon_ie_len;
		struct mwifiex_bss_priv bss_priv = (void )bss->priv;
		size_t beacon_ie_len = bss->len_information_elements;
		const struct cfg80211_bss_ies *ies;

		rcu_read_lock();
		ies = rcu_dereference(bss->ies);
		if (WARN_ON(!ies)) {
		/* should never happen */
		rcu_read_unlock();
		return -EINVAL;
		}
		beacon_ie = kmemdup(ies->data, ies->len, GFP_ATOMIC);
		beacon_ie_len = ies->len;
		rcu_read_unlock();

		beacon_ie = kmemdup(bss->information_elements, beacon_ie_len,
		GFP_KERNEL);
		if (!beacon_ie) {
		dev_err(priv->adapter->dev, " failed to alloc beacon_ie\n");
		return -ENOMEM;
		@@ -199,18 +209,23 @@ int mwifiex_fill_new_bss_desc(struct mwifiex_private *priv,
		static int mwifiex_process_country_ie(struct mwifiex_private *priv,
		struct cfg80211_bss *bss)
		{
		u8 *country_ie, country_ie_len;
		const u8 *country_ie;
		u8 country_ie_len;
		struct mwifiex_802_11d_domain_reg *domain_info =
		&priv->adapter->domain_reg;

		country_ie = (u8 *)ieee80211_bss_get_ie(bss, WLAN_EID_COUNTRY);

		if (!country_ie)
		rcu_read_lock();
		country_ie = ieee80211_bss_get_ie(bss, WLAN_EID_COUNTRY);
		if (!country_ie) {
		rcu_read_unlock();
		return 0;
		}

		country_ie_len = country_ie[1];
		if (country_ie_len < IEEE80211_COUNTRY_IE_MIN_LEN)
		if (country_ie_len < IEEE80211_COUNTRY_IE_MIN_LEN) {
		rcu_read_unlock();
		return 0;
		}

		domain_info->country_code[0] = country_ie[2];
		domain_info->country_code[1] = country_ie[3];
		@@ -224,6 +239,8 @@ static int mwifiex_process_country_ie(struct mwifiex_private *priv,
		memcpy((u8 *)domain_info->triplet,
		&country_ie[2] + IEEE80211_COUNTRY_STRING_LEN, country_ie_len);

		rcu_read_unlock();

		if (mwifiex_send_cmd_async(priv, HostCmd_CMD_802_11D_DOMAIN_INFO,
		HostCmd_ACT_GEN_SET, 0, NULL)) {
		wiphy_err(priv->adapter->wiphy,

drivers/net/wireless/ti/wl1251/main.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -896,11 +896,13 @@ static int wl1251_op_hw_scan(struct ieee80211_hw *hw,
		goto out;

		skb = ieee80211_probereq_get(wl->hw, wl->vif, ssid, ssid_len,
		req->ie, req->ie_len);
		req->ie_len);
		if (!skb) {
		ret = -ENOMEM;
		goto out;
		}
		if (req->ie_len)
		memcpy(skb_put(skb, req->ie_len), req->ie, req->ie_len);

		ret = wl1251_cmd_template_set(wl, CMD_PROBE_REQ, skb->data,
		skb->len);

drivers/net/wireless/ti/wlcore/cmd.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1038,11 +1038,13 @@ int wl12xx_cmd_build_probe_req(struct wl1271 wl, struct wl12xx_vif wlvif,
		u16 template_id_5 = CMD_TEMPL_CFG_PROBE_REQ_5;

		skb = ieee80211_probereq_get(wl->hw, vif, ssid, ssid_len,
		ie, ie_len);
		ie_len);
		if (!skb) {
		ret = -ENOMEM;
		goto out;
		}
		if (ie_len)
		memcpy(skb_put(skb, ie_len), ie, ie_len);

		wl1271_dump(DEBUG_SCAN, "PROBE REQ: ", skb->data, skb->len);