Merge branch 'for-linville' of git://github.com/kvalo/ath6kl (b9d90578) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/net/wireless/ath/ath6kl/Kconfig

+21 −4

Original line number	Diff line number	Diff line
		config ATH6KL
		tristate "Atheros ath6kl support"
		tristate "Atheros mobile chipsets support"

		config ATH6KL_SDIO
		tristate "Atheros ath6kl SDIO support"
		depends on ATH6KL
		depends on MMC
		depends on CFG80211
		---help---
		This module adds support for wireless adapters based on
		Atheros AR6003 chipset running over SDIO. If you choose to
		build it as a module, it will be called ath6kl. Pls note
		that AR6002 and AR6001 are not supported by this driver.
		Atheros AR6003 and AR6004 chipsets running over SDIO. If you
		choose to build it as a module, it will be called ath6kl_sdio.
		Please note that AR6002 and AR6001 are not supported by this
		driver.

		config ATH6KL_USB
		tristate "Atheros ath6kl USB support"
		depends on ATH6KL
		depends on USB
		depends on CFG80211
		depends on EXPERIMENTAL
		---help---
		This module adds support for wireless adapters based on
		Atheros AR6004 chipset running over USB. This is still under
		implementation and it isn't functional. If you choose to
		build it as a module, it will be called ath6kl_usb.

		config ATH6KL_DEBUG
		bool "Atheros ath6kl debugging"

drivers/net/wireless/ath/ath6kl/Makefile

+17 −13

Original line number	Diff line number	Diff line
		@@ -21,17 +21,21 @@
		# Author(s): ="Atheros"
		#------------------------------------------------------------------------------

		obj-$(CONFIG_ATH6KL) := ath6kl.o
		ath6kl-y += debug.o
		ath6kl-y += hif.o
		ath6kl-y += htc.o
		ath6kl-y += bmi.o
		ath6kl-y += cfg80211.o
		ath6kl-y += init.o
		ath6kl-y += main.o
		ath6kl-y += txrx.o
		ath6kl-y += wmi.o
		ath6kl-y += sdio.o
		ath6kl-$(CONFIG_NL80211_TESTMODE) += testmode.o
		obj-$(CONFIG_ATH6KL) += ath6kl_core.o
		ath6kl_core-y += debug.o
		ath6kl_core-y += hif.o
		ath6kl_core-y += htc.o
		ath6kl_core-y += bmi.o
		ath6kl_core-y += cfg80211.o
		ath6kl_core-y += init.o
		ath6kl_core-y += main.o
		ath6kl_core-y += txrx.o
		ath6kl_core-y += wmi.o
		ath6kl_core-y += core.o
		ath6kl_core-$(CONFIG_NL80211_TESTMODE) += testmode.o

		ccflags-y += -D__CHECK_ENDIAN__
		obj-$(CONFIG_ATH6KL_SDIO) += ath6kl_sdio.o
		ath6kl_sdio-y += sdio.o

		obj-$(CONFIG_ATH6KL_USB) += ath6kl_usb.o
		ath6kl_usb-y += usb.o

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -57,8 +57,14 @@ int ath6kl_bmi_get_target_info(struct ath6kl *ar,
		return ret;
		}

		if (ar->hif_type == ATH6KL_HIF_TYPE_USB) {
		ret = ath6kl_hif_bmi_read(ar, (u8 *)targ_info,
		sizeof(*targ_info));
		} else {
		ret = ath6kl_hif_bmi_read(ar, (u8 *)&targ_info->version,
		sizeof(targ_info->version));
		}

		if (ret) {
		ath6kl_err("Unable to recv target info: %d\n", ret);
		return ret;

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

+403 −203

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		*/

		#include <linux/moduleparam.h>
		#include <linux/inetdevice.h>
		#include <linux/export.h>

		#include "core.h"
		#include "cfg80211.h"
		@@ -22,10 +24,6 @@
		#include "hif-ops.h"
		#include "testmode.h"

		static unsigned int ath6kl_p2p;

		module_param(ath6kl_p2p, uint, 0644);

		#define RATETAB_ENT(_rate, _rateid, _flags) { \
		.bitrate = (_rate), \
		.flags = (_flags), \
		@@ -196,7 +194,7 @@ static int ath6kl_set_auth_type(struct ath6kl_vif *vif,
		break;

		default:
		ath6kl_err("%s: 0x%x not spported\n", __func__, auth_type);
		ath6kl_err("%s: 0x%x not supported\n", __func__, auth_type);
		return -ENOTSUPP;
		}

		@@ -461,13 +459,13 @@ static int ath6kl_cfg80211_connect(struct wiphy wiphy, struct net_device dev,
		}
		}

		if (sme->ie && (sme->ie_len > 0)) {
		status = ath6kl_set_assoc_req_ies(vif, sme->ie, sme->ie_len);
		if (status) {
		up(&ar->sem);
		return status;
		}
		} else

		if (sme->ie == NULL \|\| sme->ie_len == 0)
		ar->connect_ctrl_flags &= ~CONNECT_WPS_FLAG;

		if (test_bit(CONNECTED, &vif->flags) &&
		@@ -523,8 +521,7 @@ static int ath6kl_cfg80211_connect(struct wiphy wiphy, struct net_device dev,
		(vif->prwise_crypto == WEP_CRYPT)) {
		struct ath6kl_key *key = NULL;

		if (sme->key_idx < WMI_MIN_KEY_INDEX \|\|
		sme->key_idx > WMI_MAX_KEY_INDEX) {
		if (sme->key_idx > WMI_MAX_KEY_INDEX) {
		ath6kl_err("key index %d out of bounds\n",
		sme->key_idx);
		up(&ar->sem);
		@@ -605,11 +602,13 @@ static int ath6kl_cfg80211_connect(struct wiphy wiphy, struct net_device dev,
		return 0;
		}

		static int ath6kl_add_bss_if_needed(struct ath6kl_vif *vif,
		static struct cfg80211_bss *
		ath6kl_add_bss_if_needed(struct ath6kl_vif *vif,
		enum network_type nw_type,
		const u8 *bssid,
		struct ieee80211_channel *chan,
		const u8 *beacon_ie, size_t beacon_ie_len)
		const u8 *beacon_ie,
		size_t beacon_ie_len)
		{
		struct ath6kl *ar = vif->ar;
		struct cfg80211_bss *bss;
		@@ -638,7 +637,7 @@ static int ath6kl_add_bss_if_needed(struct ath6kl_vif *vif,
		*/
		ie = kmalloc(2 + vif->ssid_len + beacon_ie_len, GFP_KERNEL);
		if (ie == NULL)
		return -ENOMEM;
		return NULL;
		ie[0] = WLAN_EID_SSID;
		ie[1] = vif->ssid_len;
		memcpy(ie + 2, vif->ssid, vif->ssid_len);
		@@ -652,15 +651,9 @@ static int ath6kl_add_bss_if_needed(struct ath6kl_vif *vif,
		"cfg80211\n", bssid);
		kfree(ie);
		} else
		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "cfg80211 already has a bss "
		"entry\n");
		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "cfg80211 already has a bss\n");

		if (bss == NULL)
		return -ENOMEM;

		cfg80211_put_bss(bss);

		return 0;
		return bss;
		}

		void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,
		@@ -672,6 +665,7 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,
		{
		struct ieee80211_channel *chan;
		struct ath6kl *ar = vif->ar;
		struct cfg80211_bss *bss;

		/* capinfo + listen interval */
		u8 assoc_req_ie_offset = sizeof(u16) + sizeof(u16);
		@@ -712,8 +706,9 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,

		chan = ieee80211_get_channel(ar->wiphy, (int) channel);

		if (ath6kl_add_bss_if_needed(vif, nw_type, bssid, chan, assoc_info,
		beacon_ie_len) < 0) {
		bss = ath6kl_add_bss_if_needed(vif, nw_type, bssid, chan,
		assoc_info, beacon_ie_len);
		if (!bss) {
		ath6kl_err("could not add cfg80211 bss entry\n");
		return;
		}
		@@ -722,6 +717,7 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,
		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",
		nw_type & ADHOC_CREATOR ? "creator" : "joiner");
		cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);
		cfg80211_put_bss(bss);
		return;
		}

		@@ -732,10 +728,10 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,
		assoc_req_ie, assoc_req_len,
		assoc_resp_ie, assoc_resp_len,
		WLAN_STATUS_SUCCESS, GFP_KERNEL);
		cfg80211_put_bss(bss);
		} else if (vif->sme_state == SME_CONNECTED) {
		/* inform roam event to cfg80211 */
		cfg80211_roamed(vif->ndev, chan, bssid,
		assoc_req_ie, assoc_req_len,
		cfg80211_roamed_bss(vif->ndev, bss, assoc_req_ie, assoc_req_len,
		assoc_resp_ie, assoc_resp_len, GFP_KERNEL);
		}
		}
		@@ -984,6 +980,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy wiphy, struct net_device ndev,
		struct ath6kl *ar = ath6kl_priv(ndev);
		struct ath6kl_vif *vif = netdev_priv(ndev);
		struct ath6kl_key *key = NULL;
		int seq_len;
		u8 key_usage;
		u8 key_type;

		@@ -997,7 +994,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy wiphy, struct net_device ndev,
		params->key);
		}

		if (key_index < WMI_MIN_KEY_INDEX \|\| key_index > WMI_MAX_KEY_INDEX) {
		if (key_index > WMI_MAX_KEY_INDEX) {
		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
		"%s: key index %d out of bounds\n", __func__,
		key_index);
		@@ -1012,8 +1009,7 @@ static int ath6kl_cfg80211_add_key(struct wiphy wiphy, struct net_device ndev,
		else
		key_usage = GROUP_USAGE;

		if (params) {
		int seq_len = params->seq_len;
		seq_len = params->seq_len;
		if (params->cipher == WLAN_CIPHER_SUITE_SMS4 &&
		seq_len > ATH6KL_KEY_SEQ_LEN) {
		/* Only first half of the WPI PN is configured */
		@@ -1028,7 +1024,6 @@ static int ath6kl_cfg80211_add_key(struct wiphy wiphy, struct net_device ndev,
		key->seq_len = seq_len;
		memcpy(key->seq, params->seq, key->seq_len);
		key->cipher = params->cipher;
		}

		switch (key->cipher) {
		case WLAN_CIPHER_SUITE_WEP40:
		@@ -1115,7 +1110,7 @@ static int ath6kl_cfg80211_del_key(struct wiphy wiphy, struct net_device ndev,
		if (!ath6kl_cfg80211_ready(vif))
		return -EIO;

		if (key_index < WMI_MIN_KEY_INDEX \|\| key_index > WMI_MAX_KEY_INDEX) {
		if (key_index > WMI_MAX_KEY_INDEX) {
		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
		"%s: key index %d out of bounds\n", __func__,
		key_index);
		@@ -1148,7 +1143,7 @@ static int ath6kl_cfg80211_get_key(struct wiphy wiphy, struct net_device ndev,
		if (!ath6kl_cfg80211_ready(vif))
		return -EIO;

		if (key_index < WMI_MIN_KEY_INDEX \|\| key_index > WMI_MAX_KEY_INDEX) {
		if (key_index > WMI_MAX_KEY_INDEX) {
		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
		"%s: key index %d out of bounds\n", __func__,
		key_index);
		@@ -1184,7 +1179,7 @@ static int ath6kl_cfg80211_set_default_key(struct wiphy *wiphy,
		if (!ath6kl_cfg80211_ready(vif))
		return -EIO;

		if (key_index < WMI_MIN_KEY_INDEX \|\| key_index > WMI_MAX_KEY_INDEX) {
		if (key_index > WMI_MAX_KEY_INDEX) {
		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG,
		"%s: key index %d out of bounds\n",
		__func__, key_index);
		@@ -1403,7 +1398,7 @@ static int ath6kl_cfg80211_del_iface(struct wiphy *wiphy,

		ath6kl_cleanup_vif(vif, test_bit(WMI_READY, &ar->flag));

		ath6kl_deinit_if_data(vif);
		ath6kl_cfg80211_vif_cleanup(vif);

		return 0;
		}
		@@ -1728,29 +1723,14 @@ static int ath6kl_flush_pmksa(struct wiphy wiphy, struct net_device netdev)
		return 0;
		}

		static int ath6kl_wow_suspend(struct ath6kl ar, struct cfg80211_wowlan wow)
		static int ath6kl_wow_usr(struct ath6kl ar, struct ath6kl_vif vif,
		struct cfg80211_wowlan wow, u32 filter)
		{
		struct ath6kl_vif *vif;
		int ret, pos, left;
		u32 filter = 0;
		u16 i;
		int ret, pos;
		u8 mask[WOW_MASK_SIZE];
		u16 i;

		vif = ath6kl_vif_first(ar);
		if (!vif)
		return -EIO;

		if (!ath6kl_cfg80211_ready(vif))
		return -EIO;

		if (!test_bit(CONNECTED, &vif->flags))
		return -EINVAL;

		/* Clear existing WOW patterns */
		for (i = 0; i < WOW_MAX_FILTERS_PER_LIST; i++)
		ath6kl_wmi_del_wow_pattern_cmd(ar->wmi, vif->fw_vif_idx,
		WOW_LIST_ID, i);
		/* Configure new WOW patterns */
		/* Configure the patterns that we received from the user. */
		for (i = 0; i < wow->n_patterns; i++) {

		/*
		@@ -1782,20 +1762,212 @@ static int ath6kl_wow_suspend(struct ath6kl ar, struct cfg80211_wowlan wow)
		}

		if (wow->disconnect)
		filter \|= WOW_FILTER_OPTION_NWK_DISASSOC;
		*filter \|= WOW_FILTER_OPTION_NWK_DISASSOC;

		if (wow->magic_pkt)
		filter \|= WOW_FILTER_OPTION_MAGIC_PACKET;
		*filter \|= WOW_FILTER_OPTION_MAGIC_PACKET;

		if (wow->gtk_rekey_failure)
		filter \|= WOW_FILTER_OPTION_GTK_ERROR;
		*filter \|= WOW_FILTER_OPTION_GTK_ERROR;

		if (wow->eap_identity_req)
		filter \|= WOW_FILTER_OPTION_EAP_REQ;
		*filter \|= WOW_FILTER_OPTION_EAP_REQ;

		if (wow->four_way_handshake)
		filter \|= WOW_FILTER_OPTION_8021X_4WAYHS;
		*filter \|= WOW_FILTER_OPTION_8021X_4WAYHS;

		return 0;
		}

		static int ath6kl_wow_ap(struct ath6kl ar, struct ath6kl_vif vif)
		{
		static const u8 unicst_pattern[] = { 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x08 };
		static const u8 unicst_mask[] = { 0x01, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x7f };
		u8 unicst_offset = 0;
		static const u8 arp_pattern[] = { 0x08, 0x06 };
		static const u8 arp_mask[] = { 0xff, 0xff };
		u8 arp_offset = 20;
		static const u8 discvr_pattern[] = { 0xe0, 0x00, 0x00, 0xf8 };
		static const u8 discvr_mask[] = { 0xf0, 0x00, 0x00, 0xf8 };
		u8 discvr_offset = 38;
		static const u8 dhcp_pattern[] = { 0xff, 0xff, 0xff, 0xff,
		0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x43 /* port 67 */ };
		static const u8 dhcp_mask[] = { 0xff, 0xff, 0xff, 0xff,
		0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
		0x00, 0x00, 0x00, 0x00, 0xff, 0xff /* port 67 */ };
		u8 dhcp_offset = 0;
		int ret;

		/* Setup unicast IP, EAPOL-like and ARP pkt pattern */
		ret = ath6kl_wmi_add_wow_pattern_cmd(ar->wmi,
		vif->fw_vif_idx, WOW_LIST_ID,
		sizeof(unicst_pattern), unicst_offset,
		unicst_pattern, unicst_mask);
		if (ret) {
		ath6kl_err("failed to add WOW unicast IP pattern\n");
		return ret;
		}

		/* Setup all ARP pkt pattern */
		ret = ath6kl_wmi_add_wow_pattern_cmd(ar->wmi,
		vif->fw_vif_idx, WOW_LIST_ID,
		sizeof(arp_pattern), arp_offset,
		arp_pattern, arp_mask);
		if (ret) {
		ath6kl_err("failed to add WOW ARP pattern\n");
		return ret;
		}

		/*
		* Setup multicast pattern for mDNS 224.0.0.251,
		* SSDP 239.255.255.250 and LLMNR 224.0.0.252
		*/
		ret = ath6kl_wmi_add_wow_pattern_cmd(ar->wmi,
		vif->fw_vif_idx, WOW_LIST_ID,
		sizeof(discvr_pattern), discvr_offset,
		discvr_pattern, discvr_mask);
		if (ret) {
		ath6kl_err("failed to add WOW mDNS/SSDP/LLMNR pattern\n");
		return ret;
		}

		/* Setup all DHCP broadcast pkt pattern */
		ret = ath6kl_wmi_add_wow_pattern_cmd(ar->wmi,
		vif->fw_vif_idx, WOW_LIST_ID,
		sizeof(dhcp_pattern), dhcp_offset,
		dhcp_pattern, dhcp_mask);
		if (ret) {
		ath6kl_err("failed to add WOW DHCP broadcast pattern\n");
		return ret;
		}

		return 0;
		}

		static int ath6kl_wow_sta(struct ath6kl ar, struct ath6kl_vif vif)
		{
		struct net_device *ndev = vif->ndev;
		static const u8 discvr_pattern[] = { 0xe0, 0x00, 0x00, 0xf8 };
		static const u8 discvr_mask[] = { 0xf0, 0x00, 0x00, 0xf8 };
		u8 discvr_offset = 38;
		u8 mac_mask[ETH_ALEN];
		int ret;

		/* Setup unicast pkt pattern */
		memset(mac_mask, 0xff, ETH_ALEN);
		ret = ath6kl_wmi_add_wow_pattern_cmd(ar->wmi,
		vif->fw_vif_idx, WOW_LIST_ID,
		ETH_ALEN, 0, ndev->dev_addr,
		mac_mask);
		if (ret) {
		ath6kl_err("failed to add WOW unicast pattern\n");
		return ret;
		}

		/*
		* Setup multicast pattern for mDNS 224.0.0.251,
		* SSDP 239.255.255.250 and LLMNR 224.0.0.252
		*/
		if ((ndev->flags & IFF_ALLMULTI) \|\|
		(ndev->flags & IFF_MULTICAST && netdev_mc_count(ndev) > 0)) {
		ret = ath6kl_wmi_add_wow_pattern_cmd(ar->wmi,
		vif->fw_vif_idx, WOW_LIST_ID,
		sizeof(discvr_pattern), discvr_offset,
		discvr_pattern, discvr_mask);
		if (ret) {
		ath6kl_err("failed to add WOW mDNS/SSDP/LLMNR "
		"pattern\n");
		return ret;
		}
		}

		return 0;
		}

		static int ath6kl_wow_suspend(struct ath6kl ar, struct cfg80211_wowlan wow)
		{
		struct in_device *in_dev;
		struct in_ifaddr *ifa;
		struct ath6kl_vif *vif;
		int ret, left;
		u32 filter = 0;
		u16 i;
		u8 index = 0;
		__be32 ips[MAX_IP_ADDRS];

		vif = ath6kl_vif_first(ar);
		if (!vif)
		return -EIO;

		if (!ath6kl_cfg80211_ready(vif))
		return -EIO;

		if (!test_bit(CONNECTED, &vif->flags))
		return -ENOTCONN;

		if (wow && (wow->n_patterns > WOW_MAX_FILTERS_PER_LIST))
		return -EINVAL;

		/* Clear existing WOW patterns */
		for (i = 0; i < WOW_MAX_FILTERS_PER_LIST; i++)
		ath6kl_wmi_del_wow_pattern_cmd(ar->wmi, vif->fw_vif_idx,
		WOW_LIST_ID, i);

		/*
		* Skip the default WOW pattern configuration
		* if the driver receives any WOW patterns from
		* the user.
		*/
		if (wow)
		ret = ath6kl_wow_usr(ar, vif, wow, &filter);
		else if (vif->nw_type == AP_NETWORK)
		ret = ath6kl_wow_ap(ar, vif);
		else
		ret = ath6kl_wow_sta(ar, vif);

		if (ret)
		return ret;

		/* Setup own IP addr for ARP agent. */
		in_dev = __in_dev_get_rtnl(vif->ndev);
		if (!in_dev)
		goto skip_arp;

		ifa = in_dev->ifa_list;
		memset(&ips, 0, sizeof(ips));

		/* Configure IP addr only if IP address count < MAX_IP_ADDRS */
		while (index < MAX_IP_ADDRS && ifa) {
		ips[index] = ifa->ifa_local;
		ifa = ifa->ifa_next;
		index++;
		}

		if (ifa) {
		ath6kl_err("total IP addr count is exceeding fw limit\n");
		return -EINVAL;
		}

		ret = ath6kl_wmi_set_ip_cmd(ar->wmi, vif->fw_vif_idx, ips[0], ips[1]);
		if (ret) {
		ath6kl_err("fail to setup ip for arp agent\n");
		return ret;
		}

		skip_arp:
		ret = ath6kl_wmi_set_wow_mode_cmd(ar->wmi, vif->fw_vif_idx,
		ATH6KL_WOW_MODE_ENABLE,
		filter,
		@@ -1803,11 +1975,26 @@ static int ath6kl_wow_suspend(struct ath6kl ar, struct cfg80211_wowlan wow)
		if (ret)
		return ret;

		clear_bit(HOST_SLEEP_MODE_CMD_PROCESSED, &vif->flags);

		ret = ath6kl_wmi_set_host_sleep_mode_cmd(ar->wmi, vif->fw_vif_idx,
		ATH6KL_HOST_MODE_ASLEEP);
		if (ret)
		return ret;

		left = wait_event_interruptible_timeout(ar->event_wq,
		test_bit(HOST_SLEEP_MODE_CMD_PROCESSED, &vif->flags),
		WMI_TIMEOUT);
		if (left == 0) {
		ath6kl_warn("timeout, didn't get host sleep cmd "
		"processed event\n");
		ret = -ETIMEDOUT;
		} else if (left < 0) {
		ath6kl_warn("error while waiting for host sleep cmd "
		"processed event %d\n", left);
		ret = left;
		}

		if (ar->tx_pending[ar->ctrl_ep]) {
		left = wait_event_interruptible_timeout(ar->event_wq,
		ar->tx_pending[ar->ctrl_ep] == 0, WMI_TIMEOUT);
		@@ -1911,6 +2098,7 @@ int ath6kl_cfg80211_suspend(struct ath6kl *ar,

		return 0;
		}
		EXPORT_SYMBOL(ath6kl_cfg80211_suspend);

		int ath6kl_cfg80211_resume(struct ath6kl *ar)
		{
		@@ -1962,6 +2150,7 @@ int ath6kl_cfg80211_resume(struct ath6kl *ar)

		return 0;
		}
		EXPORT_SYMBOL(ath6kl_cfg80211_resume);

		#ifdef CONFIG_PM

		@@ -2014,7 +2203,18 @@ static int ath6kl_set_channel(struct wiphy wiphy, struct net_device dev,
		struct ieee80211_channel *chan,
		enum nl80211_channel_type channel_type)
		{
		struct ath6kl_vif *vif = netdev_priv(dev);
		struct ath6kl_vif *vif;

		/*
		* 'dev' could be NULL if a channel change is required for the hardware
		* device itself, instead of a particular VIF.
		*
		* FIXME: To be handled properly when monitor mode is supported.
		*/
		if (!dev)
		return -EBUSY;

		vif = netdev_priv(dev);

		if (!ath6kl_cfg80211_ready(vif))
		return -EIO;
		@@ -2214,6 +2414,11 @@ static int ath6kl_ap_beacon(struct wiphy wiphy, struct net_device dev,
		p.dot11_auth_mode = vif->dot11_auth_mode;
		p.ch = cpu_to_le16(vif->next_chan);

		/* Enable uAPSD support by default */
		res = ath6kl_wmi_ap_set_apsd(ar->wmi, vif->fw_vif_idx, true);
		if (res < 0)
		return res;

		if (vif->wdev.iftype == NL80211_IFTYPE_P2P_GO) {
		p.nw_subtype = SUBTYPE_P2PGO;
		} else {
		@@ -2259,6 +2464,19 @@ static int ath6kl_del_beacon(struct wiphy wiphy, struct net_device dev)
		return 0;
		}

		static const u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };

		static int ath6kl_del_station(struct wiphy wiphy, struct net_device dev,
		u8 *mac)
		{
		struct ath6kl *ar = ath6kl_priv(dev);
		struct ath6kl_vif *vif = netdev_priv(dev);
		const u8 *addr = mac ? mac : bcast_addr;

		return ath6kl_wmi_ap_set_mlme(ar->wmi, vif->fw_vif_idx, WMI_AP_DEAUTH,
		addr, WLAN_REASON_PREV_AUTH_NOT_VALID);
		}

		static int ath6kl_change_station(struct wiphy wiphy, struct net_device dev,
		u8 mac, struct station_parameters params)
		{
		@@ -2518,6 +2736,12 @@ ath6kl_mgmt_stypes[NUM_NL80211_IFTYPES] = {
		.rx = BIT(IEEE80211_STYPE_ACTION >> 4) \|
		BIT(IEEE80211_STYPE_PROBE_REQ >> 4)
		},
		[NL80211_IFTYPE_AP] = {
		.tx = BIT(IEEE80211_STYPE_ACTION >> 4) \|
		BIT(IEEE80211_STYPE_PROBE_RESP >> 4),
		.rx = BIT(IEEE80211_STYPE_ACTION >> 4) \|
		BIT(IEEE80211_STYPE_PROBE_REQ >> 4)
		},
		[NL80211_IFTYPE_P2P_CLIENT] = {
		.tx = BIT(IEEE80211_STYPE_ACTION >> 4) \|
		BIT(IEEE80211_STYPE_PROBE_RESP >> 4),
		@@ -2562,6 +2786,7 @@ static struct cfg80211_ops ath6kl_cfg80211_ops = {
		.add_beacon = ath6kl_add_beacon,
		.set_beacon = ath6kl_set_beacon,
		.del_beacon = ath6kl_del_beacon,
		.del_station = ath6kl_del_station,
		.change_station = ath6kl_change_station,
		.remain_on_channel = ath6kl_remain_on_channel,
		.cancel_remain_on_channel = ath6kl_cancel_remain_on_channel,
		@@ -2629,122 +2854,9 @@ void ath6kl_cfg80211_stop_all(struct ath6kl *ar)
		ath6kl_cfg80211_stop(vif);
		}

		struct ath6kl ath6kl_core_alloc(struct device dev)
		{
		struct ath6kl *ar;
		struct wiphy *wiphy;
		u8 ctr;

		/* create a new wiphy for use with cfg80211 */
		wiphy = wiphy_new(&ath6kl_cfg80211_ops, sizeof(struct ath6kl));

		if (!wiphy) {
		ath6kl_err("couldn't allocate wiphy device\n");
		return NULL;
		}

		ar = wiphy_priv(wiphy);
		ar->p2p = !!ath6kl_p2p;
		ar->wiphy = wiphy;
		ar->dev = dev;

		ar->vif_max = 1;

		ar->max_norm_iface = 1;

		spin_lock_init(&ar->lock);
		spin_lock_init(&ar->mcastpsq_lock);
		spin_lock_init(&ar->list_lock);

		init_waitqueue_head(&ar->event_wq);
		sema_init(&ar->sem, 1);

		INIT_LIST_HEAD(&ar->amsdu_rx_buffer_queue);
		INIT_LIST_HEAD(&ar->vif_list);

		clear_bit(WMI_ENABLED, &ar->flag);
		clear_bit(SKIP_SCAN, &ar->flag);
		clear_bit(DESTROY_IN_PROGRESS, &ar->flag);

		ar->listen_intvl_t = A_DEFAULT_LISTEN_INTERVAL;
		ar->listen_intvl_b = 0;
		ar->tx_pwr = 0;

		ar->intra_bss = 1;
		ar->lrssi_roam_threshold = DEF_LRSSI_ROAM_THRESHOLD;

		ar->state = ATH6KL_STATE_OFF;

		memset((u8 *)ar->sta_list, 0,
		AP_MAX_NUM_STA * sizeof(struct ath6kl_sta));

		/* Init the PS queues */
		for (ctr = 0; ctr < AP_MAX_NUM_STA; ctr++) {
		spin_lock_init(&ar->sta_list[ctr].psq_lock);
		skb_queue_head_init(&ar->sta_list[ctr].psq);
		}

		skb_queue_head_init(&ar->mcastpsq);

		memcpy(ar->ap_country_code, DEF_AP_COUNTRY_CODE, 3);

		return ar;
		}

		int ath6kl_register_ieee80211_hw(struct ath6kl *ar)
		{
		struct wiphy *wiphy = ar->wiphy;
		int ret;

		wiphy->mgmt_stypes = ath6kl_mgmt_stypes;

		wiphy->max_remain_on_channel_duration = 5000;

		/* set device pointer for wiphy */
		set_wiphy_dev(wiphy, ar->dev);

		wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) \|
		BIT(NL80211_IFTYPE_ADHOC) \|
		BIT(NL80211_IFTYPE_AP);
		if (ar->p2p) {
		wiphy->interface_modes \|= BIT(NL80211_IFTYPE_P2P_GO) \|
		BIT(NL80211_IFTYPE_P2P_CLIENT);
		}

		/* max num of ssids that can be probed during scanning */
		wiphy->max_scan_ssids = MAX_PROBED_SSID_INDEX;
		wiphy->max_scan_ie_len = 1000; /* FIX: what is correct limit? */
		wiphy->bands[IEEE80211_BAND_2GHZ] = &ath6kl_band_2ghz;
		wiphy->bands[IEEE80211_BAND_5GHZ] = &ath6kl_band_5ghz;
		wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;

		wiphy->cipher_suites = cipher_suites;
		wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);

		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->max_sched_scan_ssids = 10;

		ret = wiphy_register(wiphy);
		if (ret < 0) {
		ath6kl_err("couldn't register wiphy device\n");
		return ret;
		}

		return 0;
		}

		static int ath6kl_init_if_data(struct ath6kl_vif *vif)
		static int ath6kl_cfg80211_vif_init(struct ath6kl_vif *vif)
		{
		vif->aggr_cntxt = aggr_init(vif->ndev);
		vif->aggr_cntxt = aggr_init(vif);
		if (!vif->aggr_cntxt) {
		ath6kl_err("failed to initialize aggr\n");
		return -ENOMEM;
		@@ -2758,12 +2870,15 @@ static int ath6kl_init_if_data(struct ath6kl_vif *vif)
		set_bit(WMM_ENABLED, &vif->flags);
		spin_lock_init(&vif->if_lock);

		INIT_LIST_HEAD(&vif->mc_filter);

		return 0;
		}

		void ath6kl_deinit_if_data(struct ath6kl_vif *vif)
		void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif)
		{
		struct ath6kl *ar = vif->ar;
		struct ath6kl_mc_filter mc_filter, tmp;

		aggr_module_destroy(vif->aggr_cntxt);

		@@ -2772,6 +2887,11 @@ void ath6kl_deinit_if_data(struct ath6kl_vif *vif)
		if (vif->nw_type == ADHOC_NETWORK)
		ar->ibss_if_active = false;

		list_for_each_entry_safe(mc_filter, tmp, &vif->mc_filter, list) {
		list_del(&mc_filter->list);
		kfree(mc_filter);
		}

		unregister_netdevice(vif->ndev);

		ar->num_vif--;
		@@ -2808,8 +2928,7 @@ struct net_device ath6kl_interface_add(struct ath6kl ar, char *name,

		ath6kl_init_control_info(vif);

		/* TODO: Pass interface specific pointer instead of ar */
		if (ath6kl_init_if_data(vif))
		if (ath6kl_cfg80211_vif_init(vif))
		goto err;

		if (register_netdevice(ndev))
		@@ -2836,8 +2955,89 @@ struct net_device ath6kl_interface_add(struct ath6kl ar, char *name,
		return NULL;
		}

		void ath6kl_deinit_ieee80211_hw(struct ath6kl *ar)
		int ath6kl_cfg80211_init(struct ath6kl *ar)
		{
		struct wiphy *wiphy = ar->wiphy;
		int ret;

		wiphy->mgmt_stypes = ath6kl_mgmt_stypes;

		wiphy->max_remain_on_channel_duration = 5000;

		/* set device pointer for wiphy */
		set_wiphy_dev(wiphy, ar->dev);

		wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) \|
		BIT(NL80211_IFTYPE_ADHOC) \|
		BIT(NL80211_IFTYPE_AP);
		if (ar->p2p) {
		wiphy->interface_modes \|= BIT(NL80211_IFTYPE_P2P_GO) \|
		BIT(NL80211_IFTYPE_P2P_CLIENT);
		}

		/* max num of ssids that can be probed during scanning */
		wiphy->max_scan_ssids = MAX_PROBED_SSID_INDEX;
		wiphy->max_scan_ie_len = 1000; /* FIX: what is correct limit? */
		wiphy->bands[IEEE80211_BAND_2GHZ] = &ath6kl_band_2ghz;
		wiphy->bands[IEEE80211_BAND_5GHZ] = &ath6kl_band_5ghz;
		wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;

		wiphy->cipher_suites = cipher_suites;
		wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);

		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->max_sched_scan_ssids = 10;

		ret = wiphy_register(wiphy);
		if (ret < 0) {
		ath6kl_err("couldn't register wiphy device\n");
		return ret;
		}

		return 0;
		}

		void ath6kl_cfg80211_cleanup(struct ath6kl *ar)
		{
		wiphy_unregister(ar->wiphy);
		}

		struct ath6kl *ath6kl_cfg80211_create(void)
		{
		struct ath6kl *ar;
		struct wiphy *wiphy;

		/* create a new wiphy for use with cfg80211 */
		wiphy = wiphy_new(&ath6kl_cfg80211_ops, sizeof(struct ath6kl));

		if (!wiphy) {
		ath6kl_err("couldn't allocate wiphy device\n");
		return NULL;
		}

		ar = wiphy_priv(wiphy);
		ar->wiphy = wiphy;

		return ar;
		}

		/* Note: ar variable must not be accessed after calling this! */
		void ath6kl_cfg80211_destroy(struct ath6kl *ar)
		{
		int i;

		for (i = 0; i < AP_MAX_NUM_STA; i++)
		kfree(ar->sta_list[i].aggr_conn);

		wiphy_free(ar->wiphy);
		}

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

+8 −4

Original line number	Diff line number	Diff line
		@@ -27,10 +27,6 @@ enum ath6kl_cfg_suspend_mode {
		struct net_device ath6kl_interface_add(struct ath6kl ar, char *name,
		enum nl80211_iftype type,
		u8 fw_vif_idx, u8 nw_type);
		int ath6kl_register_ieee80211_hw(struct ath6kl *ar);
		struct ath6kl ath6kl_core_alloc(struct device dev);
		void ath6kl_deinit_ieee80211_hw(struct ath6kl *ar);

		void ath6kl_cfg80211_scan_complete_event(struct ath6kl_vif *vif, bool aborted);

		void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel,
		@@ -53,7 +49,15 @@ int ath6kl_cfg80211_suspend(struct ath6kl *ar,

		int ath6kl_cfg80211_resume(struct ath6kl *ar);

		void ath6kl_cfg80211_vif_cleanup(struct ath6kl_vif *vif);

		void ath6kl_cfg80211_stop(struct ath6kl_vif *vif);
		void ath6kl_cfg80211_stop_all(struct ath6kl *ar);

		int ath6kl_cfg80211_init(struct ath6kl *ar);
		void ath6kl_cfg80211_cleanup(struct ath6kl *ar);

		struct ath6kl *ath6kl_cfg80211_create(void);
		void ath6kl_cfg80211_destroy(struct ath6kl *ar);

		#endif /* ATH6KL_CFG80211_H */