diff options
| author | John Audia <therealgraysky@proton.me> | 2022-06-22 11:58:33 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-27 22:34:07 +0200 |
| commit | f2f03545d4d9f4df44300b95edfd340db1474501 (patch) | |
| tree | 47c9aa7ac35b02f91510dee8872a00a7b6156a78 /target/linux/generic/backport-5.10/610-v5.13-49-net-ethernet-mtk_eth_soc-rework-NAPI-callbacks.patch | |
| parent | 50db012243c107e69210341ba07ba6091e32106c (diff) | |
| download | upstream-f2f03545d4d9f4df44300b95edfd340db1474501.tar.gz upstream-f2f03545d4d9f4df44300b95edfd340db1474501.tar.bz2 upstream-f2f03545d4d9f4df44300b95edfd340db1474501.zip | |
kernel: bump 5.10 to 5.10.124
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 9e5d743422edc4036cda7d96b96ba62705f382de)
Diffstat (limited to 'target/linux/generic/backport-5.10/610-v5.13-49-net-ethernet-mtk_eth_soc-rework-NAPI-callbacks.patch')
| -rw-r--r-- | target/linux/generic/backport-5.10/610-v5.13-49-net-ethernet-mtk_eth_soc-rework-NAPI-callbacks.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.10/610-v5.13-49-net-ethernet-mtk_eth_soc-rework-NAPI-callbacks.patch b/target/linux/generic/backport-5.10/610-v5.13-49-net-ethernet-mtk_eth_soc-rework-NAPI-callbacks.patch index d0926325d9..a423df0d9a 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-49-net-ethernet-mtk_eth_soc-rework-NAPI-callbacks.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-49-net-ethernet-mtk_eth_soc-rework-NAPI-callbacks.patch @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -1517,7 +1517,6 @@ static void mtk_handle_status_irq(struct +@@ -1531,7 +1531,6 @@ static void mtk_handle_status_irq(struct static int mtk_napi_tx(struct napi_struct *napi, int budget) { struct mtk_eth *eth = container_of(napi, struct mtk_eth, tx_napi); @@ -25,7 +25,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int tx_done = 0; if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA)) -@@ -1526,21 +1525,19 @@ static int mtk_napi_tx(struct napi_struc +@@ -1540,21 +1539,19 @@ static int mtk_napi_tx(struct napi_struc tx_done = mtk_poll_tx(eth, budget); if (unlikely(netif_msg_intr(eth))) { @@ -52,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mtk_tx_irq_enable(eth, MTK_TX_DONE_INT); return tx_done; -@@ -1549,36 +1546,33 @@ static int mtk_napi_tx(struct napi_struc +@@ -1563,36 +1560,33 @@ static int mtk_napi_tx(struct napi_struc static int mtk_napi_rx(struct napi_struct *napi, int budget) { struct mtk_eth *eth = container_of(napi, struct mtk_eth, rx_napi); |