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

Commit 3105dfb2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-next-for-davem-2017-02-16' of... 

Merge tag 'wireless-drivers-next-for-davem-2017-02-16' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for 4.11

Mostly small fixes, not really any new features.

Major changes:

ath10k

* when trying older firmware versions don't confuse user with error messages

ath9k

* fix crash in AP mode (regression)
* fix relayfs crash (regression)
* fix initialisation with AR9340 and AR9550
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6d6a505a b065d3f5

drivers/net/wireless/ath/ath10k/core.c

+34 −38
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ void ath10k_core_get_fw_features_str(struct ath10k *ar, 
				     char *buf,

				     size_t buf_len)

{

	unsigned int len = 0;

	size_t len = 0;

	int i;



	for (i = 0; i < ATH10K_FW_FEATURE_COUNT; i++) {
@@ -456,7 +456,10 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar, 
		dir = ".";



	snprintf(filename, sizeof(filename), "%s/%s", dir, file);

	ret = request_firmware(&fw, filename, ar->dev);

	ret = request_firmware_direct(&fw, filename, ar->dev);

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",

		   filename, ret);



	if (ret)

		return ERR_PTR(ret);
@@ -698,7 +701,8 @@ static int ath10k_core_get_board_id_from_otp(struct ath10k *ar) 


	if ((result & ATH10K_BMI_BOARD_ID_STATUS_MASK) != 0 ||

	    (board_id == 0)) {

		ath10k_warn(ar, "board id is not exist in otp, ignore it\n");

		ath10k_dbg(ar, ATH10K_DBG_BOOT,

			   "board id does not exist in otp, ignore it\n");

		return -EOPNOTSUPP;

	}
@@ -1122,7 +1126,7 @@ static int ath10k_core_create_board_name(struct ath10k *ar, char *name, 
					 size_t name_len)

{

	/* strlen(',variant=') + strlen(ar->id.bdf_ext) */

	char variant[9 + ATH10K_SMBIOS_BDF_EXT_STR_LENGTH];

	char variant[9 + ATH10K_SMBIOS_BDF_EXT_STR_LENGTH] = { 0 };



	if (ar->id.bmi_ids_valid) {

		scnprintf(name, name_len,
@@ -1168,7 +1172,8 @@ static int ath10k_core_fetch_board_file(struct ath10k *ar) 
	ar->bd_api = 1;

	ret = ath10k_core_fetch_board_data_api_1(ar);

	if (ret) {

		ath10k_err(ar, "failed to fetch board data\n");

		ath10k_err(ar, "failed to fetch board-2.bin or board.bin from %s\n",

			   ar->hw_params.fw.dir);

		return ret;

	}
@@ -1189,12 +1194,8 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, 
	/* first fetch the firmware file (firmware-*.bin) */

	fw_file->firmware = ath10k_fetch_fw_file(ar, ar->hw_params.fw.dir,

						 name);

	if (IS_ERR(fw_file->firmware)) {

		ath10k_err(ar, "could not fetch firmware file '%s/%s': %ld\n",

			   ar->hw_params.fw.dir, name,

			   PTR_ERR(fw_file->firmware));

	if (IS_ERR(fw_file->firmware))

		return PTR_ERR(fw_file->firmware);

	}



	data = fw_file->firmware->data;

	len = fw_file->firmware->size;
@@ -1358,43 +1359,38 @@ int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name, 
	return ret;

}



static void ath10k_core_get_fw_name(struct ath10k *ar, char *fw_name,

				    size_t fw_name_len, int fw_api)

{

	scnprintf(fw_name, fw_name_len, "%s-%d.bin", ATH10K_FW_FILE_BASE, fw_api);

}



static int ath10k_core_fetch_firmware_files(struct ath10k *ar)

{

	int ret;

	int ret, i;

	char fw_name[100];



	/* calibration file is optional, don't check for any errors */

	ath10k_fetch_cal_file(ar);



	ar->fw_api = 5;

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);



	ret = ath10k_core_fetch_firmware_api_n(ar, ATH10K_FW_API5_FILE,

					       &ar->normal_mode_fw.fw_file);

	if (ret == 0)

		goto success;



	ar->fw_api = 4;

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);

	for (i = ATH10K_FW_API_MAX; i >= ATH10K_FW_API_MIN; i--) {

		ar->fw_api = i;

		ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n",

			   ar->fw_api);



	ret = ath10k_core_fetch_firmware_api_n(ar, ATH10K_FW_API4_FILE,

		ath10k_core_get_fw_name(ar, fw_name, sizeof(fw_name), ar->fw_api);

		ret = ath10k_core_fetch_firmware_api_n(ar, fw_name,

						       &ar->normal_mode_fw.fw_file);

	if (ret == 0)

		if (!ret)

			goto success;

	}



	ar->fw_api = 3;

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);

	/* we end up here if we couldn't fetch any firmware */



	ret = ath10k_core_fetch_firmware_api_n(ar, ATH10K_FW_API3_FILE,

					       &ar->normal_mode_fw.fw_file);

	if (ret == 0)

		goto success;



	ar->fw_api = 2;

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);

	ath10k_err(ar, "Failed to find firmware-N.bin (N between %d and %d) from %s: %d",

		   ATH10K_FW_API_MIN, ATH10K_FW_API_MAX, ar->hw_params.fw.dir,

		   ret);



	ret = ath10k_core_fetch_firmware_api_n(ar, ATH10K_FW_API2_FILE,

					       &ar->normal_mode_fw.fw_file);

	if (ret)

	return ret;



success:

drivers/net/wireless/ath/ath10k/debug.c

+24 −25
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static ssize_t ath10k_read_wmi_services(struct file *file, 
{

	struct ath10k *ar = file->private_data;

	char *buf;

	unsigned int len = 0, buf_len = 4096;

	size_t len = 0, buf_len = 4096;

	const char *name;

	ssize_t ret_cnt;

	bool enabled;
@@ -529,7 +529,7 @@ static ssize_t ath10k_fw_stats_read(struct file *file, char __user *user_buf, 
				    size_t count, loff_t *ppos)

{

	const char *buf = file->private_data;

	unsigned int len = strlen(buf);

	size_t len = strlen(buf);



	return simple_read_from_buffer(user_buf, count, ppos, buf, len);

}
@@ -547,17 +547,16 @@ static ssize_t ath10k_debug_fw_reset_stats_read(struct file *file, 
						size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	int ret, len, buf_len;

	int ret;

	size_t len = 0, buf_len = 500;

	char *buf;



	buf_len = 500;

	buf = kmalloc(buf_len, GFP_KERNEL);

	if (!buf)

		return -ENOMEM;



	spin_lock_bh(&ar->data_lock);



	len = 0;

	len += scnprintf(buf + len, buf_len - len,

			 "fw_crash_counter\t\t%d\n", ar->stats.fw_crash_counter);

	len += scnprintf(buf + len, buf_len - len,
@@ -696,7 +695,7 @@ static ssize_t ath10k_read_chip_id(struct file *file, char __user *user_buf, 
				   size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	unsigned int len;

	size_t len;

	char buf[50];



	len = scnprintf(buf, sizeof(buf), "0x%08x\n", ar->chip_id);
@@ -733,8 +732,8 @@ static struct ath10k_dump_file_data *ath10k_build_dump_file(struct ath10k *ar, 
	struct ath10k_ce_crash_hdr *ce_hdr;

	struct ath10k_dump_file_data *dump_data;

	struct ath10k_tlv_dump_data *dump_tlv;

	int hdr_len = sizeof(*dump_data);

	unsigned int len, sofar = 0;

	size_t hdr_len = sizeof(*dump_data);

	size_t len, sofar = 0;

	unsigned char *buf;



	len = hdr_len;
@@ -900,7 +899,7 @@ static ssize_t ath10k_reg_addr_read(struct file *file, 
{

	struct ath10k *ar = file->private_data;

	u8 buf[32];

	unsigned int len = 0;

	size_t len = 0;

	u32 reg_addr;



	mutex_lock(&ar->conf_mutex);
@@ -948,7 +947,7 @@ static ssize_t ath10k_reg_value_read(struct file *file, 
{

	struct ath10k *ar = file->private_data;

	u8 buf[48];

	unsigned int len;

	size_t len;

	u32 reg_addr, reg_val;

	int ret;
@@ -1171,7 +1170,7 @@ static ssize_t ath10k_read_htt_stats_mask(struct file *file, 
{

	struct ath10k *ar = file->private_data;

	char buf[32];

	unsigned int len;

	size_t len;



	len = scnprintf(buf, sizeof(buf), "%lu\n", ar->debug.htt_stats_mask);
@@ -1225,7 +1224,7 @@ static ssize_t ath10k_read_htt_max_amsdu_ampdu(struct file *file, 
	struct ath10k *ar = file->private_data;

	char buf[64];

	u8 amsdu, ampdu;

	unsigned int len;

	size_t len;



	mutex_lock(&ar->conf_mutex);
@@ -1285,7 +1284,7 @@ static ssize_t ath10k_read_fw_dbglog(struct file *file, 
				     size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	unsigned int len;

	size_t len;

	char buf[96];



	len = scnprintf(buf, sizeof(buf), "0x%16llx %u\n",
@@ -1611,11 +1610,10 @@ static ssize_t ath10k_read_ani_enable(struct file *file, char __user *user_buf, 
				      size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	int len = 0;

	size_t len;

	char buf[32];



	len = scnprintf(buf, sizeof(buf) - len, "%d\n",

			ar->ani_enabled);

	len = scnprintf(buf, sizeof(buf), "%d\n", ar->ani_enabled);



	return simple_read_from_buffer(user_buf, count, ppos, buf, len);

}
@@ -1640,11 +1638,10 @@ static ssize_t ath10k_read_nf_cal_period(struct file *file, 
					 size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	unsigned int len;

	size_t len;

	char buf[32];



	len = scnprintf(buf, sizeof(buf), "%d\n",

			ar->debug.nf_cal_period);

	len = scnprintf(buf, sizeof(buf), "%d\n", ar->debug.nf_cal_period);



	return simple_read_from_buffer(user_buf, count, ppos, buf, len);

}
@@ -1740,9 +1737,10 @@ void ath10k_debug_tpc_stats_process(struct ath10k *ar, 
}



static void ath10k_tpc_stats_print(struct ath10k_tpc_stats *tpc_stats,

				   unsigned int j, char *buf, unsigned int *len)

				   unsigned int j, char *buf, size_t *len)

{

	unsigned int i, buf_len;

	int i;

	size_t buf_len;

	static const char table_str[][5] = { "CDD",

					     "STBC",

					     "TXBF" };
@@ -1782,7 +1780,8 @@ static void ath10k_tpc_stats_fill(struct ath10k *ar, 
				  struct ath10k_tpc_stats *tpc_stats,

				  char *buf)

{

	unsigned int len, j, buf_len;

	int j;

	size_t len, buf_len;



	len = 0;

	buf_len = ATH10K_TPC_CONFIG_BUF_SIZE;
@@ -1916,7 +1915,7 @@ static ssize_t ath10k_tpc_stats_read(struct file *file, char __user *user_buf, 
				     size_t count, loff_t *ppos)

{

	const char *buf = file->private_data;

	unsigned int len = strlen(buf);

	size_t len = strlen(buf);



	return simple_read_from_buffer(user_buf, count, ppos, buf, len);

}
@@ -2340,7 +2339,7 @@ static ssize_t ath10k_debug_fw_checksums_read(struct file *file, 
					      size_t count, loff_t *ppos)

{

	struct ath10k *ar = file->private_data;

	unsigned int len = 0, buf_len = 4096;

	size_t len = 0, buf_len = 4096;

	ssize_t ret_cnt;

	char *buf;
@@ -2556,7 +2555,7 @@ void ath10k_dbg_dump(struct ath10k *ar, 
		     const void *buf, size_t len)

{

	char linebuf[256];

	unsigned int linebuflen;

	size_t linebuflen;

	const void *ptr;



	if (ath10k_debug_mask & mask) {

drivers/net/wireless/ath/ath10k/hw.h

+4 −0
Original line number Diff line number Diff line
@@ -128,6 +128,10 @@ enum qca9377_chip_id_rev { 
#define QCA4019_HW_1_0_BOARD_DATA_FILE "board.bin"

#define QCA4019_HW_1_0_PATCH_LOAD_ADDR  0x1234



#define ATH10K_FW_FILE_BASE		"firmware"

#define ATH10K_FW_API_MAX		5

#define ATH10K_FW_API_MIN		2



#define ATH10K_FW_API2_FILE		"firmware-2.bin"

#define ATH10K_FW_API3_FILE		"firmware-3.bin"

drivers/net/wireless/ath/ath10k/mac.c

+34 −34
Original line number Diff line number Diff line
@@ -1993,7 +1993,7 @@ static void ath10k_mac_handle_beacon_iter(void *data, u8 *mac, 
{

	struct sk_buff *skb = data;

	struct ieee80211_mgmt *mgmt = (void *)skb->data;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;



	if (vif->type != NL80211_IFTYPE_STATION)

		return;
@@ -2016,7 +2016,7 @@ static void ath10k_mac_handle_beacon_miss_iter(void *data, u8 *mac, 
					       struct ieee80211_vif *vif)

{

	u32 *vdev_id = data;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct ath10k *ar = arvif->ar;

	struct ieee80211_hw *hw = ar->hw;
@@ -2083,7 +2083,7 @@ static void ath10k_peer_assoc_h_basic(struct ath10k *ar, 
				      struct ieee80211_sta *sta,

				      struct wmi_peer_assoc_complete_arg *arg)

{

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	u32 aid;



	lockdep_assert_held(&ar->conf_mutex);
@@ -2159,7 +2159,7 @@ static void ath10k_peer_assoc_h_rates(struct ath10k *ar, 
				      struct ieee80211_sta *sta,

				      struct wmi_peer_assoc_complete_arg *arg)

{

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct wmi_rate_set_arg *rateset = &arg->peer_legacy_rates;

	struct cfg80211_chan_def def;

	const struct ieee80211_supported_band *sband;
@@ -2222,7 +2222,7 @@ static void ath10k_peer_assoc_h_ht(struct ath10k *ar, 
				   struct wmi_peer_assoc_complete_arg *arg)

{

	const struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct cfg80211_chan_def def;

	enum nl80211_band band;

	const u8 *ht_mcs_mask;
@@ -2446,7 +2446,7 @@ static void ath10k_peer_assoc_h_vht(struct ath10k *ar, 
				    struct wmi_peer_assoc_complete_arg *arg)

{

	const struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct cfg80211_chan_def def;

	enum nl80211_band band;

	const u16 *vht_mcs_mask;
@@ -2507,7 +2507,7 @@ static void ath10k_peer_assoc_h_qos(struct ath10k *ar, 
				    struct ieee80211_sta *sta,

				    struct wmi_peer_assoc_complete_arg *arg)

{

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;



	switch (arvif->vdev_type) {

	case WMI_VDEV_TYPE_AP:
@@ -2574,7 +2574,7 @@ static void ath10k_peer_assoc_h_phymode(struct ath10k *ar, 
					struct ieee80211_sta *sta,

					struct wmi_peer_assoc_complete_arg *arg)

{

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct cfg80211_chan_def def;

	enum nl80211_band band;

	const u8 *ht_mcs_mask;
@@ -2689,7 +2689,7 @@ static int ath10k_mac_vif_recalc_txbf(struct ath10k *ar, 
				      struct ieee80211_vif *vif,

				      struct ieee80211_sta_vht_cap vht_cap)

{

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	int ret;

	u32 param;

	u32 value;
@@ -2756,7 +2756,7 @@ static void ath10k_bss_assoc(struct ieee80211_hw *hw, 
			     struct ieee80211_bss_conf *bss_conf)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct ieee80211_sta_ht_cap ht_cap;

	struct ieee80211_sta_vht_cap vht_cap;

	struct wmi_peer_assoc_complete_arg peer_arg;
@@ -2849,7 +2849,7 @@ static void ath10k_bss_disassoc(struct ieee80211_hw *hw, 
				struct ieee80211_vif *vif)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct ieee80211_sta_vht_cap vht_cap = {};

	int ret;
@@ -2882,7 +2882,7 @@ static int ath10k_station_assoc(struct ath10k *ar, 
				struct ieee80211_sta *sta,

				bool reassoc)

{

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct wmi_peer_assoc_complete_arg peer_arg;

	int ret = 0;
@@ -2949,7 +2949,7 @@ static int ath10k_station_disassoc(struct ath10k *ar, 
				   struct ieee80211_vif *vif,

				   struct ieee80211_sta *sta)

{

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	int ret = 0;



	lockdep_assert_held(&ar->conf_mutex);
@@ -3175,7 +3175,7 @@ static void ath10k_mac_tx_unlock_iter(void *data, u8 *mac, 
				      struct ieee80211_vif *vif)

{

	struct ath10k *ar = data;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;



	if (arvif->tx_paused)

		return;
@@ -3262,7 +3262,7 @@ struct ath10k_mac_tx_pause { 
static void ath10k_mac_handle_tx_pause_iter(void *data, u8 *mac,

					    struct ieee80211_vif *vif)

{

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct ath10k_mac_tx_pause *arg = data;



	if (arvif->vdev_id != arg->vdev_id)
@@ -3358,7 +3358,7 @@ static bool ath10k_tx_h_use_hwcrypto(struct ieee80211_vif *vif, 
		return false;



	if (vif)

		return !ath10k_vif_to_arvif(vif)->nohwcrypt;

		return !((struct ath10k_vif *)vif->drv_priv)->nohwcrypt;



	return true;

}
@@ -3423,7 +3423,7 @@ static void ath10k_tx_h_add_p2p_noa_ie(struct ath10k *ar, 
				       struct sk_buff *skb)

{

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;



	/* This is case only for P2P_GO */

	if (vif->type != NL80211_IFTYPE_AP || !vif->p2p)
@@ -4849,7 +4849,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 
				struct ieee80211_vif *vif)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct ath10k_peer *peer;

	enum wmi_sta_powersave_param param;

	int ret = 0;
@@ -5185,7 +5185,7 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw, 
				    struct ieee80211_vif *vif)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct ath10k_peer *peer;

	int ret;

	int i;
@@ -5320,7 +5320,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, 
				    u32 changed)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	int ret = 0;

	u32 vdev_param, pdev_param, slottime, preamble;
@@ -5512,7 +5512,7 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw, 
			  struct ieee80211_scan_request *hw_req)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct cfg80211_scan_request *req = &hw_req->req;

	struct wmi_start_scan_arg arg;

	int ret = 0;
@@ -5644,7 +5644,7 @@ static int ath10k_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
			  struct ieee80211_key_conf *key)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct ath10k_peer *peer;

	const u8 *peer_addr;

	bool is_wep = key->cipher == WLAN_CIPHER_SUITE_WEP40 ||
@@ -5783,7 +5783,7 @@ static void ath10k_set_default_unicast_key(struct ieee80211_hw *hw, 
					   int keyidx)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	int ret;



	mutex_lock(&arvif->ar->conf_mutex);
@@ -5964,7 +5964,7 @@ static int ath10k_mac_tdls_vif_stations_count(struct ieee80211_hw *hw, 
static void ath10k_mac_tdls_vifs_count_iter(void *data, u8 *mac,

					    struct ieee80211_vif *vif)

{

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	int *num_tdls_vifs = data;



	if (vif->type != NL80211_IFTYPE_STATION)
@@ -5992,7 +5992,7 @@ static int ath10k_sta_state(struct ieee80211_hw *hw, 
			    enum ieee80211_sta_state new_state)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv;

	struct ath10k_peer *peer;

	int ret = 0;
@@ -6227,7 +6227,7 @@ static int ath10k_sta_state(struct ieee80211_hw *hw, 
static int ath10k_conf_tx_uapsd(struct ath10k *ar, struct ieee80211_vif *vif,

				u16 ac, bool enable)

{

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct wmi_sta_uapsd_auto_trig_arg arg = {};

	u32 prio = 0, acc = 0;

	u32 value = 0;
@@ -6335,7 +6335,7 @@ static int ath10k_conf_tx(struct ieee80211_hw *hw, 
			  const struct ieee80211_tx_queue_params *params)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct wmi_wmm_params_arg *p = NULL;

	int ret;
@@ -6409,7 +6409,7 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw, 
				    enum ieee80211_roc_type type)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct wmi_start_scan_arg arg;

	int ret = 0;

	u32 scan_time_msec;
@@ -6909,7 +6909,7 @@ static int ath10k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw, 
					  struct ieee80211_vif *vif,

					  const struct cfg80211_bitrate_mask *mask)

{

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct cfg80211_chan_def def;

	struct ath10k *ar = arvif->ar;

	enum nl80211_band band;
@@ -7060,7 +7060,7 @@ static void ath10k_offset_tsf(struct ieee80211_hw *hw, 
			      struct ieee80211_vif *vif, s64 tsf_offset)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	u32 offset, vdev_param;

	int ret;
@@ -7085,7 +7085,7 @@ static int ath10k_ampdu_action(struct ieee80211_hw *hw, 
			       struct ieee80211_ampdu_params *params)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;

	struct ieee80211_sta *sta = params->sta;

	enum ieee80211_ampdu_mlme_action action = params->action;

	u16 tid = params->tid;
@@ -7183,7 +7183,7 @@ ath10k_mac_update_vif_chan(struct ath10k *ar, 
		ath10k_monitor_stop(ar);



	for (i = 0; i < n_vifs; i++) {

		arvif = ath10k_vif_to_arvif(vifs[i].vif);

		arvif = (void *)vifs[i].vif->drv_priv;



		ath10k_dbg(ar, ATH10K_DBG_MAC,

			   "mac chanctx switch vdev_id %i freq %hu->%hu width %d->%d\n",
@@ -7216,7 +7216,7 @@ ath10k_mac_update_vif_chan(struct ath10k *ar, 
	spin_unlock_bh(&ar->data_lock);



	for (i = 0; i < n_vifs; i++) {

		arvif = ath10k_vif_to_arvif(vifs[i].vif);

		arvif = (void *)vifs[i].vif->drv_priv;



		if (WARN_ON(!arvif->is_started))

			continue;
@@ -7873,7 +7873,7 @@ static void ath10k_get_arvif_iter(void *data, u8 *mac, 
				  struct ieee80211_vif *vif)

{

	struct ath10k_vif_iter *arvif_iter = data;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;



	if (arvif->vdev_id == arvif_iter->vdev_id)

		arvif_iter->arvif = arvif;

drivers/net/wireless/ath/ath10k/mac.h

+1 −6
Original line number Diff line number Diff line
@@ -83,17 +83,12 @@ struct ieee80211_txq *ath10k_mac_txq_lookup(struct ath10k *ar, 
					    u8 tid);

int ath10k_mac_ext_resource_config(struct ath10k *ar, u32 val);



static inline struct ath10k_vif *ath10k_vif_to_arvif(struct ieee80211_vif *vif)

{

	return (struct ath10k_vif *)vif->drv_priv;

}



static inline void ath10k_tx_h_seq_no(struct ieee80211_vif *vif,

				      struct sk_buff *skb)

{

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct ath10k_vif *arvif = ath10k_vif_to_arvif(vif);

	struct ath10k_vif *arvif = (void *)vif->drv_priv;



	if (info->flags  & IEEE80211_TX_CTL_ASSIGN_SEQ) {

		if (arvif->tx_seq_no == 0)