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-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.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-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch')
| -rw-r--r-- | target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch b/target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch index 2622b2cedc..be258da75a 100644 --- a/target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch +++ b/target/linux/generic/backport-5.15/702-v5.19-23-net-ethernet-mtk_eth_soc-add-rxd_size-to-mtk_soc_dat.patch @@ -13,7 +13,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 -@@ -1758,7 +1758,7 @@ static int mtk_rx_alloc(struct mtk_eth * +@@ -1775,7 +1775,7 @@ static int mtk_rx_alloc(struct mtk_eth * } ring->dma = dma_alloc_coherent(eth->dma_dev, @@ -22,7 +22,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> &ring->phys, GFP_KERNEL); if (!ring->dma) return -ENOMEM; -@@ -1816,9 +1816,8 @@ static void mtk_rx_clean(struct mtk_eth +@@ -1833,9 +1833,8 @@ static void mtk_rx_clean(struct mtk_eth if (ring->dma) { dma_free_coherent(eth->dma_dev, @@ -34,7 +34,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> ring->dma = NULL; } } -@@ -3386,6 +3385,7 @@ static const struct mtk_soc_data mt2701_ +@@ -3403,6 +3402,7 @@ static const struct mtk_soc_data mt2701_ .required_pctl = true, .txrx = { .txd_size = sizeof(struct mtk_tx_dma), @@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -3397,6 +3397,7 @@ static const struct mtk_soc_data mt7621_ +@@ -3414,6 +3414,7 @@ static const struct mtk_soc_data mt7621_ .offload_version = 2, .txrx = { .txd_size = sizeof(struct mtk_tx_dma), @@ -50,7 +50,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -3409,6 +3410,7 @@ static const struct mtk_soc_data mt7622_ +@@ -3426,6 +3427,7 @@ static const struct mtk_soc_data mt7622_ .offload_version = 2, .txrx = { .txd_size = sizeof(struct mtk_tx_dma), @@ -58,7 +58,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -3420,6 +3422,7 @@ static const struct mtk_soc_data mt7623_ +@@ -3437,6 +3439,7 @@ static const struct mtk_soc_data mt7623_ .offload_version = 2, .txrx = { .txd_size = sizeof(struct mtk_tx_dma), @@ -66,7 +66,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -3431,6 +3434,7 @@ static const struct mtk_soc_data mt7629_ +@@ -3448,6 +3451,7 @@ static const struct mtk_soc_data mt7629_ .required_pctl = false, .txrx = { .txd_size = sizeof(struct mtk_tx_dma), @@ -74,7 +74,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }, }; -@@ -3441,6 +3445,7 @@ static const struct mtk_soc_data rt5350_ +@@ -3458,6 +3462,7 @@ static const struct mtk_soc_data rt5350_ .required_pctl = false, .txrx = { .txd_size = sizeof(struct mtk_tx_dma), |