1 files changed, 17 insertions, 8 deletions

diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
index edc57ab505c8..7f1bccd3597f 100644
--- a/drivers/net/wireless/ath/ath10k/htc.c
+++ b/drivers/net/wireless/ath/ath10k/htc.c
@@ -63,7 +63,9 @@ static struct sk_buff *ath10k_htc_build_tx_ctrl_skb(void *ar)
 static inline void ath10k_htc_restore_tx_skb(struct ath10k_htc *htc,
                                              struct sk_buff *skb)
 {
-        ath10k_skb_unmap(htc->ar->dev, skb);
+        struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
+
+        dma_unmap_single(htc->ar->dev, skb_cb->paddr, skb->len, DMA_TO_DEVICE);
         skb_pull(skb, sizeof(struct ath10k_htc_hdr));
 }
 
@@ -122,6 +124,9 @@ int ath10k_htc_send(struct ath10k_htc *htc,
                     struct sk_buff *skb)
 {
         struct ath10k_htc_ep *ep = &htc->endpoint[eid];
+        struct ath10k_skb_cb *skb_cb = ATH10K_SKB_CB(skb);
+        struct ath10k_hif_sg_item sg_item;
+        struct device *dev = htc->ar->dev;
         int credits = 0;
         int ret;
 
@@ -157,19 +162,25 @@ int ath10k_htc_send(struct ath10k_htc *htc,
 
         ath10k_htc_prepare_tx_skb(ep, skb);
 
-        ret = ath10k_skb_map(htc->ar->dev, skb);
+        skb_cb->paddr = dma_map_single(dev, skb->data, skb->len, DMA_TO_DEVICE);
+        ret = dma_mapping_error(dev, skb_cb->paddr);
         if (ret)
                 goto err_credits;
 
-        ret = ath10k_hif_send_head(htc->ar, ep->ul_pipe_id, ep->eid,
-                                   skb->len, skb);
+        sg_item.transfer_id = ep->eid;
+        sg_item.transfer_context = skb;
+        sg_item.vaddr = skb->data;
+        sg_item.paddr = skb_cb->paddr;
+        sg_item.len = skb->len;
+
+        ret = ath10k_hif_tx_sg(htc->ar, ep->ul_pipe_id, &sg_item, 1);
         if (ret)
                 goto err_unmap;
 
         return 0;
 
 err_unmap:
-        ath10k_skb_unmap(htc->ar->dev, skb);
+        dma_unmap_single(dev, skb_cb->paddr, skb->len, DMA_TO_DEVICE);
 err_credits:
         if (ep->tx_credit_flow_enabled) {
                 spin_lock_bh(&htc->tx_lock);
@@ -191,10 +202,8 @@ static int ath10k_htc_tx_completion_handler(struct ath10k *ar,
         struct ath10k_htc *htc = &ar->htc;
         struct ath10k_htc_ep *ep = &htc->endpoint[eid];
 
-        if (!skb) {
-                ath10k_warn("invalid sk_buff completion - NULL pointer. firmware crashed?\n");
+        if (WARN_ON_ONCE(!skb))
                 return 0;
-        }
 
         ath10k_htc_notify_tx_completion(ep, skb);
         /* the skb now belongs to the completion handler */