Michal Kazior <michal.kazior@xxxxxxxxx> writes:
> The mgmt_rx event structure has been expanded.
> Since the structure header is expanded the payload
> (i.e. mgmt frame) is shifted by a few bytes. This
> needs to be taken into account in order to support
> both old and new firmware.
>
> Signed-off-by: Michal Kazior <michal.kazior@xxxxxxxxx>
[...]
> @@ -325,13 +327,24 @@ static int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb)
> u32 rate;
> u32 buf_len;
> u16 fc;
> + int pull_len;
> +
> + if (ar->fw_version_build > 636) {
> + ev_abi2 = (struct wmi_mgmt_rx_event_abi2 *)skb->data;
> + ev_hdr = &ev_abi2->hdr.abi1;
> + pull_len = sizeof(*ev_abi2);
> + } else {
> + ev_abi1 = (struct wmi_mgmt_rx_event_abi1 *)skb->data;
> + ev_hdr = &ev_abi1->hdr;
> + pull_len = sizeof(*ev_abi1);
> + }
I would prefer to have ar->fw_features (or similar) bitmap for handling
this. That way we can group all firmware version tests into one place
and not sprinkle them around. I suspect there will be more tests like
this.
[...]
> --- a/drivers/net/wireless/ath/ath10k/wmi.h
> +++ b/drivers/net/wireless/ath/ath10k/wmi.h
> @@ -1268,7 +1268,7 @@ struct wmi_scan_event {
> * good idea to pass all the fields in the RX status
> * descriptor up to the host.
> */
> -struct wmi_mgmt_rx_hdr {
> +struct wmi_mgmt_rx_hdr_abi1 {
> __le32 channel;
> __le32 snr;
> __le32 rate;
> @@ -1277,8 +1277,18 @@ struct wmi_mgmt_rx_hdr {
> __le32 status; /* %WMI_RX_STATUS_ */
> } __packed;
>
> -struct wmi_mgmt_rx_event {
> - struct wmi_mgmt_rx_hdr hdr;
> +struct wmi_mgmt_rx_hdr_abi2 {
> + struct wmi_mgmt_rx_hdr_abi1 abi1;
> + __le32 rssi_ctl[4];
> +} __packed;
> +
> +struct wmi_mgmt_rx_event_abi1 {
> + struct wmi_mgmt_rx_hdr_abi1 hdr;
> + u8 buf[0];
> +} __packed;
> +
> +struct wmi_mgmt_rx_event_abi2 {
> + struct wmi_mgmt_rx_hdr_abi2 hdr;
> u8 buf[0];
> } __packed;
I would prefer to use v1 and v2 instead on abi1 and abi2.
--
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
