fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipq40xx: fix error patch

Browse Source
This commit is contained in:
AmadeusGhost 2020-01-26 17:53:52 +08:00
parent 14d42a488d
commit 6471bb3481
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
target/linux/ipq40xx/patches-4.14/714-essedma-add-fix-for-memory-allocation.patch
View File

@ -115,12 +115,14 @@ Reviewed-by: Grant Grundler <grundler@chromium.org>
}
/* At this point skb should go to stack */
@@ -756,11 +769,17 @@ static void edma_rx_complete(struct edma
@@ -756,13 +769,17 @@ static u16 edma_rx_complete(struct edma_common_info *edma_cinfo,
/* Refill here in case refill threshold wasn't reached */
if (likely(cleaned_count)) {
ret_count = edma_alloc_rx_buf(edma_cinfo, erdr, cleaned_count, queue_id);
- if (ret_count)
if (edma_rfd_desc_unused(erdr)) {
ret_count = edma_alloc_rx_buf(edma_cinfo, erdr, edma_rfd_desc_unused(erdr), queue_id);
- if (ret_count) {
- dev_dbg(&pdev->dev, "Not all buffers was reallocated");
- edma_realloc_timer_start(napi, queue_id);
- }
+ erdr->pending_fill = ret_count;
+ if (ret_count) {
+ if (net_ratelimit())
@ -135,7 +137,7 @@ Reviewed-by: Grant Grundler <grundler@chromium.org>
}
/* edma_delete_rfs_filter()
@@ -2064,6 +2083,7 @@ int edma_poll(struct napi_struct *napi,
@@ -2064,6 +2081,7 @@ int edma_poll(struct napi_struct *napi,
u32 shadow_rx_status, shadow_tx_status;
int queue_id;
int i, work_done = 0;
@ -143,7 +145,7 @@ Reviewed-by: Grant Grundler <grundler@chromium.org>
/* Store the Rx/Tx status by ANDing it with
* appropriate CPU RX?TX mask
@@ -2097,13 +2117,19 @@ int edma_poll(struct napi_struct *napi,
@@ -2097,13 +2115,19 @@ int edma_poll(struct napi_struct *napi,
*/
while (edma_percpu_info->rx_status) {
queue_id = ffs(edma_percpu_info->rx_status) - 1;