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

Documentation/DocBook/80211.tmpl

+5 −6

Original line number	Diff line number	Diff line
		@@ -127,12 +127,11 @@
		!Finclude/net/cfg80211.h cfg80211_ibss_params
		!Finclude/net/cfg80211.h cfg80211_connect_params
		!Finclude/net/cfg80211.h cfg80211_pmksa
		!Finclude/net/cfg80211.h cfg80211_send_rx_auth
		!Finclude/net/cfg80211.h cfg80211_send_auth_timeout
		!Finclude/net/cfg80211.h cfg80211_send_rx_assoc
		!Finclude/net/cfg80211.h cfg80211_send_assoc_timeout
		!Finclude/net/cfg80211.h cfg80211_send_deauth
		!Finclude/net/cfg80211.h cfg80211_send_disassoc
		!Finclude/net/cfg80211.h cfg80211_rx_mlme_mgmt
		!Finclude/net/cfg80211.h cfg80211_auth_timeout
		!Finclude/net/cfg80211.h cfg80211_rx_assoc_resp
		!Finclude/net/cfg80211.h cfg80211_assoc_timeout
		!Finclude/net/cfg80211.h cfg80211_tx_mlme_mgmt
		!Finclude/net/cfg80211.h cfg80211_ibss_joined
		!Finclude/net/cfg80211.h cfg80211_connect_result
		!Finclude/net/cfg80211.h cfg80211_roamed

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

+32 −19

Original line number	Diff line number	Diff line
		@@ -3175,10 +3175,21 @@ static int ath6kl_mgmt_tx(struct wiphy wiphy, struct wireless_dev wdev,
		{
		struct ath6kl_vif *vif = ath6kl_vif_from_wdev(wdev);
		struct ath6kl *ar = ath6kl_priv(vif->ndev);
		u32 id;
		u32 id, freq;
		const struct ieee80211_mgmt *mgmt;
		bool more_data, queued;

		/* default to the current channel, but use the one specified as argument
		* if any
		*/
		freq = vif->ch_hint;
		if (chan)
		freq = chan->center_freq;

		/* never send freq zero to the firmware */
		if (WARN_ON(freq == 0))
		return -EINVAL;

		mgmt = (const struct ieee80211_mgmt *) buf;
		if (vif->nw_type == AP_NETWORK && test_bit(CONNECTED, &vif->flags) &&
		ieee80211_is_probe_resp(mgmt->frame_control) &&
		@@ -3188,8 +3199,7 @@ static int ath6kl_mgmt_tx(struct wiphy wiphy, struct wireless_dev wdev,
		* command to allow the target to fill in the generic IEs.
		*/
		cookie = 0; / TX status not supported */
		return ath6kl_send_go_probe_resp(vif, buf, len,
		chan->center_freq);
		return ath6kl_send_go_probe_resp(vif, buf, len, freq);
		}

		id = vif->send_action_id++;
		@@ -3205,17 +3215,14 @@ static int ath6kl_mgmt_tx(struct wiphy wiphy, struct wireless_dev wdev,

		/* AP mode Power saving processing */
		if (vif->nw_type == AP_NETWORK) {
		queued = ath6kl_mgmt_powersave_ap(vif,
		id, chan->center_freq,
		wait, buf,
		len, &more_data, no_cck);
		queued = ath6kl_mgmt_powersave_ap(vif, id, freq, wait, buf, len,
		&more_data, no_cck);
		if (queued)
		return 0;
		}

		return ath6kl_wmi_send_mgmt_cmd(ar->wmi, vif->fw_vif_idx, id,
		chan->center_freq, wait,
		buf, len, no_cck);
		return ath6kl_wmi_send_mgmt_cmd(ar->wmi, vif->fw_vif_idx, id, freq,
		wait, buf, len, no_cck);
		}

		static void ath6kl_mgmt_frame_register(struct wiphy *wiphy,
		@@ -3679,6 +3686,20 @@ struct wireless_dev ath6kl_interface_add(struct ath6kl ar, const char *name,
		return NULL;
		}

		#ifdef CONFIG_PM
		static const struct wiphy_wowlan_support ath6kl_wowlan_support = {
		.flags = WIPHY_WOWLAN_MAGIC_PKT \|
		WIPHY_WOWLAN_DISCONNECT \|
		WIPHY_WOWLAN_GTK_REKEY_FAILURE \|
		WIPHY_WOWLAN_SUPPORTS_GTK_REKEY \|
		WIPHY_WOWLAN_EAP_IDENTITY_REQ \|
		WIPHY_WOWLAN_4WAY_HANDSHAKE,
		.n_patterns = WOW_MAX_FILTERS_PER_LIST,
		.pattern_min_len = 1,
		.pattern_max_len = WOW_PATTERN_SIZE,
		};
		#endif

		int ath6kl_cfg80211_init(struct ath6kl *ar)
		{
		struct wiphy *wiphy = ar->wiphy;
		@@ -3772,15 +3793,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
		wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);

		#ifdef CONFIG_PM
		wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT \|
		WIPHY_WOWLAN_DISCONNECT \|
		WIPHY_WOWLAN_GTK_REKEY_FAILURE \|
		WIPHY_WOWLAN_SUPPORTS_GTK_REKEY \|
		WIPHY_WOWLAN_EAP_IDENTITY_REQ \|
		WIPHY_WOWLAN_4WAY_HANDSHAKE;
		wiphy->wowlan.n_patterns = WOW_MAX_FILTERS_PER_LIST;
		wiphy->wowlan.pattern_min_len = 1;
		wiphy->wowlan.pattern_max_len = WOW_PATTERN_SIZE;
		wiphy->wowlan = &ath6kl_wowlan_support;
		#endif

		wiphy->max_sched_scan_ssids = MAX_PROBED_SSIDS;

drivers/net/wireless/ath/ath9k/init.c

+11 −7

Original line number	Diff line number	Diff line
		@@ -755,6 +755,15 @@ static const struct ieee80211_iface_combination if_comb[] = {
		}
		};

		#ifdef CONFIG_PM
		static const struct wiphy_wowlan_support ath9k_wowlan_support = {
		.flags = WIPHY_WOWLAN_MAGIC_PKT \| WIPHY_WOWLAN_DISCONNECT,
		.n_patterns = MAX_NUM_USER_PATTERN,
		.pattern_min_len = 1,
		.pattern_max_len = MAX_PATTERN_SIZE,
		};
		#endif

		void ath9k_set_hw_capab(struct ath_softc sc, struct ieee80211_hw hw)
		{
		struct ath_hw *ah = sc->sc_ah;
		@@ -802,13 +811,8 @@ void ath9k_set_hw_capab(struct ath_softc sc, struct ieee80211_hw hw)

		#ifdef CONFIG_PM_SLEEP
		if ((ah->caps.hw_caps & ATH9K_HW_WOW_DEVICE_CAPABLE) &&
		device_can_wakeup(sc->dev)) {
		hw->wiphy->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT \|
		WIPHY_WOWLAN_DISCONNECT;
		hw->wiphy->wowlan.n_patterns = MAX_NUM_USER_PATTERN;
		hw->wiphy->wowlan.pattern_min_len = 1;
		hw->wiphy->wowlan.pattern_max_len = MAX_PATTERN_SIZE;
		}
		device_can_wakeup(sc->dev))
		hw->wiphy->wowlan = &ath9k_wowlan_support;

		atomic_set(&sc->wow_sleep_proc_intr, -1);
		atomic_set(&sc->wow_got_bmiss_intr, -1);

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

+12 −3

Original line number	Diff line number	Diff line
		@@ -3982,6 +3982,7 @@ brcmf_cfg80211_mgmt_tx(struct wiphy wiphy, struct wireless_dev wdev,
		struct brcmf_fil_af_params_le *af_params;
		bool ack;
		s32 chan_nr;
		u32 freq;

		brcmf_dbg(TRACE, "Enter\n");

		@@ -3994,6 +3995,8 @@ brcmf_cfg80211_mgmt_tx(struct wiphy wiphy, struct wireless_dev wdev,
		return -EPERM;
		}

		vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);

		if (ieee80211_is_probe_resp(mgmt->frame_control)) {
		/* Right now the only reason to get a probe response */
		/* is for p2p listen response or for p2p GO from */
		@@ -4009,7 +4012,6 @@ brcmf_cfg80211_mgmt_tx(struct wiphy wiphy, struct wireless_dev wdev,
		ie_offset = DOT11_MGMT_HDR_LEN +
		DOT11_BCN_PRB_FIXED_LEN;
		ie_len = len - ie_offset;
		vif = container_of(wdev, struct brcmf_cfg80211_vif, wdev);
		if (vif == cfg->p2p.bss_idx[P2PAPI_BSSCFG_PRIMARY].vif)
		vif = cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
		err = brcmf_vif_set_mgmt_ie(vif,
		@@ -4033,8 +4035,15 @@ brcmf_cfg80211_mgmt_tx(struct wiphy wiphy, struct wireless_dev wdev,
		memcpy(&af_params->bssid[0], &mgmt->bssid[0], ETH_ALEN);
		/* Add the length exepted for 802.11 header */
		action_frame->len = cpu_to_le16(len - DOT11_MGMT_HDR_LEN);
		/* Add the channel */
		chan_nr = ieee80211_frequency_to_channel(chan->center_freq);
		/* Add the channel. Use the one specified as parameter if any or
		* the current one (got from the firmware) otherwise
		*/
		if (chan)
		freq = chan->center_freq;
		else
		brcmf_fil_cmd_int_get(vif->ifp, BRCMF_C_GET_CHANNEL,
		&freq);
		chan_nr = ieee80211_frequency_to_channel(freq);
		af_params->channel = cpu_to_le32(chan_nr);

		memcpy(action_frame->data, &buf[DOT11_MGMT_HDR_LEN],

drivers/net/wireless/cw1200/main.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -245,6 +245,14 @@ module_param(cw1200_ba_tx_tids, int, 0644);
		MODULE_PARM_DESC(cw1200_ba_rx_tids, "Block ACK RX TIDs");
		MODULE_PARM_DESC(cw1200_ba_tx_tids, "Block ACK TX TIDs");

		#ifdef CONFIG_PM
		static const struct wiphy_wowlan_support cw1200_wowlan_support = {
		/* Support only for limited wowlan functionalities */
		.flags = WIPHY_WOWLAN_ANY \| WIPHY_WOWLAN_DISCONNECT,
		};
		#endif


		static struct ieee80211_hw cw1200_init_common(const u8 macaddr,
		const bool have_5ghz)
		{
		@@ -289,10 +297,7 @@ static struct ieee80211_hw cw1200_init_common(const u8 macaddr,
		BIT(NL80211_IFTYPE_P2P_GO);

		#ifdef CONFIG_PM
		/* Support only for limited wowlan functionalities */
		hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY \|
		WIPHY_WOWLAN_DISCONNECT;
		hw->wiphy->wowlan.n_patterns = 0;
		hw->wiphy->wowlan = &cw1200_wowlan_support;
		#endif

		hw->wiphy->flags \|= WIPHY_FLAG_AP_UAPSD;