Commit 19222601 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git patches for v5.18. Major changes:

ath6kl

* add device ID for WLU5150-D81
parents 3b03fc9a 83fe43ab

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

+1 −1
Original line number Diff line number Diff line
@@ -1551,11 +1551,11 @@ static int ath10k_setup_msa_resources(struct ath10k *ar, u32 msa_size) 
	node = of_parse_phandle(dev->of_node, "memory-region", 0);

	if (node) {

		ret = of_address_to_resource(node, 0, &r);

		of_node_put(node);

		if (ret) {

			dev_err(dev, "failed to resolve msa fixed region\n");

			return ret;

		}

		of_node_put(node);



		ar->msa.paddr = r.start;

		ar->msa.mem_size = resource_size(&r);

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

+0 −1
Original line number Diff line number Diff line
@@ -1417,7 +1417,6 @@ EXPORT_SYMBOL(ath11k_core_deinit); 


void ath11k_core_free(struct ath11k_base *ab)

{

	flush_workqueue(ab->workqueue);

	destroy_workqueue(ab->workqueue);



	kfree(ab);

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

+1 −0
Original line number Diff line number Diff line
@@ -1217,6 +1217,7 @@ static int ath6kl_usb_pm_resume(struct usb_interface *interface) 
static const struct usb_device_id ath6kl_usb_ids[] = {

	{USB_DEVICE(0x0cf3, 0x9375)},

	{USB_DEVICE(0x0cf3, 0x9374)},

	{USB_DEVICE(0x04da, 0x390d)},

	{ /* Terminating entry */ },

};

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

+4 −18
Original line number Diff line number Diff line
@@ -1750,7 +1750,6 @@ static int ath6kl_wmi_snr_threshold_event_rx(struct wmi *wmi, u8 *datap, 


static int ath6kl_wmi_aplist_event_rx(struct wmi *wmi, u8 *datap, int len)

{

	u16 ap_info_entry_size;

	struct wmi_aplist_event *ev = (struct wmi_aplist_event *) datap;

	struct wmi_ap_info_v1 *ap_info_v1;

	u8 index;
@@ -1759,14 +1758,12 @@ static int ath6kl_wmi_aplist_event_rx(struct wmi *wmi, u8 *datap, int len) 
	    ev->ap_list_ver != APLIST_VER1)

		return -EINVAL;



	ap_info_entry_size = sizeof(struct wmi_ap_info_v1);

	ap_info_v1 = (struct wmi_ap_info_v1 *) ev->ap_list;



	ath6kl_dbg(ATH6KL_DBG_WMI,

		   "number of APs in aplist event: %d\n", ev->num_ap);



	if (len < (int) (sizeof(struct wmi_aplist_event) +

			 (ev->num_ap - 1) * ap_info_entry_size))

	if (len < struct_size(ev, ap_list, ev->num_ap))

		return -EINVAL;



	/* AP list version 1 contents */
@@ -1959,21 +1956,15 @@ static int ath6kl_wmi_startscan_cmd(struct wmi *wmi, u8 if_idx, 
{

	struct sk_buff *skb;

	struct wmi_start_scan_cmd *sc;

	s8 size;

	int i, ret;



	size = sizeof(struct wmi_start_scan_cmd);



	if ((scan_type != WMI_LONG_SCAN) && (scan_type != WMI_SHORT_SCAN))

		return -EINVAL;



	if (num_chan > WMI_MAX_CHANNELS)

		return -EINVAL;



	if (num_chan)

		size += sizeof(u16) * (num_chan - 1);



	skb = ath6kl_wmi_get_new_buf(size);

	skb = ath6kl_wmi_get_new_buf(struct_size(sc, ch_list, num_chan));

	if (!skb)

		return -ENOMEM;
@@ -2008,7 +1999,7 @@ int ath6kl_wmi_beginscan_cmd(struct wmi *wmi, u8 if_idx, 
	struct ieee80211_supported_band *sband;

	struct sk_buff *skb;

	struct wmi_begin_scan_cmd *sc;

	s8 size, *supp_rates;

	s8 *supp_rates;

	int i, band, ret;

	struct ath6kl *ar = wmi->parent_dev;

	int num_rates;
@@ -2023,18 +2014,13 @@ int ath6kl_wmi_beginscan_cmd(struct wmi *wmi, u8 if_idx, 
						num_chan, ch_list);

	}



	size = sizeof(struct wmi_begin_scan_cmd);



	if ((scan_type != WMI_LONG_SCAN) && (scan_type != WMI_SHORT_SCAN))

		return -EINVAL;



	if (num_chan > WMI_MAX_CHANNELS)

		return -EINVAL;



	if (num_chan)

		size += sizeof(u16) * (num_chan - 1);



	skb = ath6kl_wmi_get_new_buf(size);

	skb = ath6kl_wmi_get_new_buf(struct_size(sc, ch_list, num_chan));

	if (!skb)

		return -ENOMEM;

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

+6 −6
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ struct wmi_begin_scan_cmd { 
	u8 num_ch;



	/* channels in Mhz */

	__le16 ch_list[1];

	__le16 ch_list[];

} __packed;



/* wmi_start_scan_cmd is to be deprecated. Use
@@ -889,7 +889,7 @@ struct wmi_start_scan_cmd { 
	u8 num_ch;



	/* channels in Mhz */

	__le16 ch_list[1];

	__le16 ch_list[];

} __packed;



/*
@@ -1373,7 +1373,7 @@ struct wmi_channel_list_reply { 
	u8 num_ch;



	/* channel in Mhz */

	__le16 ch_list[1];

	__le16 ch_list[];

} __packed;



/* List of Events (target to host) */
@@ -1545,7 +1545,7 @@ struct wmi_connect_event { 
	u8 beacon_ie_len;

	u8 assoc_req_len;

	u8 assoc_resp_len;

	u8 assoc_info[1];

	u8 assoc_info[];

} __packed;



/* Disconnect Event */
@@ -1596,7 +1596,7 @@ struct wmi_disconnect_event { 
	u8 disconn_reason;



	u8 assoc_resp_len;

	u8 assoc_info[1];

	u8 assoc_info[];

} __packed;



/*
@@ -1957,7 +1957,7 @@ union wmi_ap_info { 
struct wmi_aplist_event {

	u8 ap_list_ver;

	u8 num_ap;

	union wmi_ap_info ap_list[1];

	union wmi_ap_info ap_list[];

} __packed;



/* Developer Commands */