wcn36xx: allocate skbs with GFP_KERNEL during init

GFP_ATOMIC should only be used when the allocation is done from atomic
context. Introduce a new flag to wcn36xx_dxe_fill_skb() and use GFP_KERNEL
when pre-allocating buffers during init.

This doesn't fix an issue that was observed in the wild, but it reduces
the chance of failed allocations under memory pressure.

Signed-off-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/wcn36xx/dxe.c b/drivers/net/wireless/ath/wcn36xx/dxe.c
index a1541a8..a6702ad 100644 (file)
--- a/drivers/net/wireless/ath/wcn36xx/dxe.c
+++ b/drivers/net/wireless/ath/wcn36xx/dxe.c
@@ -274,12 +274,14 @@ static int wcn36xx_dxe_enable_ch_int(struct wcn36xx *wcn, u16 wcn_ch)
        return 0;
 }
 
-static int wcn36xx_dxe_fill_skb(struct device *dev, struct wcn36xx_dxe_ctl *ctl)
+static int wcn36xx_dxe_fill_skb(struct device *dev,
+                               struct wcn36xx_dxe_ctl *ctl,
+                               gfp_t gfp)
 {
        struct wcn36xx_dxe_desc *dxe = ctl->desc;
        struct sk_buff *skb;
 
-       skb = alloc_skb(WCN36XX_PKT_SIZE, GFP_ATOMIC);
+       skb = alloc_skb(WCN36XX_PKT_SIZE, gfp);
        if (skb == NULL)
                return -ENOMEM;
 
@@ -306,7 +308,7 @@ static int wcn36xx_dxe_ch_alloc_skb(struct wcn36xx *wcn,
        cur_ctl = wcn_ch->head_blk_ctl;
 
        for (i = 0; i < wcn_ch->desc_num; i++) {
-               wcn36xx_dxe_fill_skb(wcn->dev, cur_ctl);
+               wcn36xx_dxe_fill_skb(wcn->dev, cur_ctl, GFP_KERNEL);
                cur_ctl = cur_ctl->next;
        }
 
@@ -531,7 +533,7 @@ static int wcn36xx_rx_handle_packets(struct wcn36xx *wcn,
        while (!(dxe->ctrl & WCN36xx_DXE_CTRL_VLD)) {
                skb = ctl->skb;
                dma_addr = dxe->dst_addr_l;
-               ret = wcn36xx_dxe_fill_skb(wcn->dev, ctl);
+               ret = wcn36xx_dxe_fill_skb(wcn->dev, ctl, GFP_ATOMIC);
                if (0 == ret) {
                        /* new skb allocation ok. Use the new one and queue
                         * the old one to network system.