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

[cascardo/linux.git] / drivers / net / wireless / ath / ath10k / htt_rx.c

diff --git a/drivers/net/wireless/ath/ath10k/htt_rx.c b/drivers/net/wireless/ath/ath10k/htt_rx.c
index 80e6453..78db5d6 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
@@ -748,7 +748,7 @@ ath10k_htt_rx_h_peer_channel(struct ath10k *ar, struct htt_rx_desc *rxd)
        if (WARN_ON_ONCE(!arvif))
                return NULL;
 
-       if (WARN_ON_ONCE(ath10k_mac_vif_chan(arvif->vif, &def)))
+       if (ath10k_mac_vif_chan(arvif->vif, &def))
                return NULL;
 
        return def.chan;
@@ -2307,12 +2307,10 @@ bool ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb)
                ath10k_htt_rx_delba(ar, resp);
                break;
        case HTT_T2H_MSG_TYPE_PKTLOG: {
-               struct ath10k_pktlog_hdr *hdr =
-                       (struct ath10k_pktlog_hdr *)resp->pktlog_msg.payload;
-
                trace_ath10k_htt_pktlog(ar, resp->pktlog_msg.payload,
-                                       sizeof(*hdr) +
-                                       __le16_to_cpu(hdr->size));
+                                       skb->len -
+                                       offsetof(struct htt_resp,
+                                                pktlog_msg.payload));
                break;
        }
        case HTT_T2H_MSG_TYPE_RX_FLUSH: {