]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
brcmfmac: fix brcmf_sdcard_send_pkt() for host without sg support
authorArend van Spriel <arend@broadcom.com>
Tue, 15 Oct 2013 13:44:55 +0000 (15:44 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 18 Oct 2013 18:06:58 +0000 (14:06 -0400)
If the host does not support scatter-gather transmit the packets
in the pktq individually using brcmf_sdio_buffrw().

Reviewed-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c

index 92818d790de5fa56b5d2d793f9b999803ab94571..1103dc1cc9dc2516465ea7f147693653ecc2e3e0 100644 (file)
@@ -620,6 +620,7 @@ int
 brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
                      uint flags, struct sk_buff_head *pktq)
 {
+       struct sk_buff *skb;
        uint width;
        int err;
 
@@ -631,9 +632,16 @@ brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
        if (err)
                return err;
 
-       if (pktq->qlen == 1)
-               return brcmf_sdio_buffrw(sdiodev, fn, true, addr, pktq->next);
-       return brcmf_sdio_sglist_rw(sdiodev, fn, true, addr, pktq);
+       if (pktq->qlen == 1 || !sdiodev->sg_support)
+               skb_queue_walk(pktq, skb) {
+                       err = brcmf_sdio_buffrw(sdiodev, fn, true, addr, skb);
+                       if (err)
+                               break;
+               }
+       else
+               err = brcmf_sdio_sglist_rw(sdiodev, fn, true, addr, pktq);
+
+       return err;
 }
 
 int