Merge 93c0b93ba9 on remote branch

Change-Id: Ifce620c136f46450e15f14fd223f6b6fc1d7db16
This commit is contained in:
Linux Build Service Account 2021-12-14 05:54:20 -08:00
commit 2da4708aa6

View file

@ -2569,7 +2569,7 @@ static void ipa3_replenish_rx_cache_recycle(struct ipa3_sys_context *sys)
spin_lock_bh(&sys->spinlock);
rx_pkt = list_first_entry(&sys->rcycl_list,
struct ipa3_rx_pkt_wrapper, link);
list_del(&rx_pkt->link);
list_del_init(&rx_pkt->link);
spin_unlock_bh(&sys->spinlock);
ptr = skb_put(rx_pkt->data.skb, sys->rx_buff_sz);
rx_pkt->data.dma_addr = dma_map_single(ipa3_ctx->pdev,
@ -2610,8 +2610,8 @@ static void ipa3_replenish_rx_cache_recycle(struct ipa3_sys_context *sys)
goto done;
fail_dma_mapping:
spin_lock_bh(&sys->spinlock);
ipa3_skb_recycle(rx_pkt->data.skb);
list_add_tail(&rx_pkt->link, &sys->rcycl_list);
INIT_LIST_HEAD(&rx_pkt->link);
spin_unlock_bh(&sys->spinlock);
fail_kmem_cache_alloc:
if (rx_len_cached == 0) {