diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-06-22 14:12:26 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-27 00:57:16 +0200 |
commit | f1cd14448221d6114c6c150a8e78fa360bbb47dd (patch) | |
tree | 274fb20de58fe215640645243aabe1b54f9bd9da /target/linux/generic/backport-5.15/702-v5.19-20-net-ethernet-mtk_eth_soc-rely-on-txd_size-in-mtk_tx_.patch | |
parent | f2795132bae896374e21f45b3ea75396c9de8b34 (diff) | |
download | upstream-f1cd14448221d6114c6c150a8e78fa360bbb47dd.tar.gz upstream-f1cd14448221d6114c6c150a8e78fa360bbb47dd.tar.bz2 upstream-f1cd14448221d6114c6c150a8e78fa360bbb47dd.zip |
kernel: bump 5.15 to 5.15.49
Deleted (upstreamed):
generic/backport-5.15/702-v5.19-34-net-ethernet-mtk_eth_soc-fix-misuse-of-mem-alloc-int.patch [1]
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.49&id=fcba12a4308143f1f1dcb0face8b3ffb51edcc5c
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-5.15/702-v5.19-20-net-ethernet-mtk_eth_soc-rely-on-txd_size-in-mtk_tx_.patch')
-rw-r--r-- | target/linux/generic/backport-5.15/702-v5.19-20-net-ethernet-mtk_eth_soc-rely-on-txd_size-in-mtk_tx_.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/backport-5.15/702-v5.19-20-net-ethernet-mtk_eth_soc-rely-on-txd_size-in-mtk_tx_.patch b/target/linux/generic/backport-5.15/702-v5.19-20-net-ethernet-mtk_eth_soc-rely-on-txd_size-in-mtk_tx_.patch index 13f1300d55..01dbca0753 100644 --- a/target/linux/generic/backport-5.15/702-v5.19-20-net-ethernet-mtk_eth_soc-rely-on-txd_size-in-mtk_tx_.patch +++ b/target/linux/generic/backport-5.15/702-v5.19-20-net-ethernet-mtk_eth_soc-rely-on-txd_size-in-mtk_tx_.patch @@ -12,7 +12,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 -@@ -1610,8 +1610,10 @@ static int mtk_napi_rx(struct napi_struc +@@ -1624,8 +1624,10 @@ static int mtk_napi_rx(struct napi_struc static int mtk_tx_alloc(struct mtk_eth *eth) { @@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> ring->buf = kcalloc(MTK_DMA_SIZE, sizeof(*ring->buf), GFP_KERNEL); -@@ -1627,8 +1629,10 @@ static int mtk_tx_alloc(struct mtk_eth * +@@ -1641,8 +1643,10 @@ static int mtk_tx_alloc(struct mtk_eth * int next = (i + 1) % MTK_DMA_SIZE; u32 next_ptr = ring->phys + next * sz; @@ -37,7 +37,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } /* On MT7688 (PDMA only) this driver uses the ring->dma structs -@@ -1650,7 +1654,7 @@ static int mtk_tx_alloc(struct mtk_eth * +@@ -1664,7 +1668,7 @@ static int mtk_tx_alloc(struct mtk_eth * ring->dma_size = MTK_DMA_SIZE; atomic_set(&ring->free_count, MTK_DMA_SIZE - 2); ring->next_free = &ring->dma[0]; @@ -46,7 +46,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> ring->last_free_ptr = (u32)(ring->phys + ((MTK_DMA_SIZE - 1) * sz)); ring->thresh = MAX_SKB_FRAGS; -@@ -1683,6 +1687,7 @@ no_tx_mem: +@@ -1697,6 +1701,7 @@ no_tx_mem: static void mtk_tx_clean(struct mtk_eth *eth) { @@ -54,7 +54,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> struct mtk_tx_ring *ring = ð->tx_ring; int i; -@@ -1695,17 +1700,15 @@ static void mtk_tx_clean(struct mtk_eth +@@ -1709,17 +1714,15 @@ static void mtk_tx_clean(struct mtk_eth if (ring->dma) { dma_free_coherent(eth->dma_dev, |