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-18-net-ethernet-mtk_eth_soc-move-tx-dma-desc-configurat.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-18-net-ethernet-mtk_eth_soc-move-tx-dma-desc-configurat.patch')
-rw-r--r-- | target/linux/generic/backport-5.15/702-v5.19-18-net-ethernet-mtk_eth_soc-move-tx-dma-desc-configurat.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-5.15/702-v5.19-18-net-ethernet-mtk_eth_soc-move-tx-dma-desc-configurat.patch b/target/linux/generic/backport-5.15/702-v5.19-18-net-ethernet-mtk_eth_soc-move-tx-dma-desc-configurat.patch index 09638b4580..95f122f730 100644 --- a/target/linux/generic/backport-5.15/702-v5.19-18-net-ethernet-mtk_eth_soc-move-tx-dma-desc-configurat.patch +++ b/target/linux/generic/backport-5.15/702-v5.19-18-net-ethernet-mtk_eth_soc-move-tx-dma-desc-configurat.patch @@ -14,7 +14,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 -@@ -960,18 +960,51 @@ static void setup_tx_buf(struct mtk_eth +@@ -971,18 +971,51 @@ static void setup_tx_buf(struct mtk_eth } } @@ -69,7 +69,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int k = 0; itxd = ring->next_free; -@@ -979,49 +1012,32 @@ static int mtk_tx_map(struct sk_buff *sk +@@ -990,49 +1023,32 @@ static int mtk_tx_map(struct sk_buff *sk if (itxd == ring->last_free) return -ENOMEM; @@ -126,7 +126,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> bool new_desc = true; if (MTK_HAS_CAPS(eth->soc->caps, MTK_QDMA) || -@@ -1036,23 +1052,17 @@ static int mtk_tx_map(struct sk_buff *sk +@@ -1047,23 +1063,17 @@ static int mtk_tx_map(struct sk_buff *sk new_desc = false; } @@ -159,7 +159,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> tx_buf = mtk_desc_to_tx_buf(ring, txd); if (new_desc) -@@ -1062,20 +1072,17 @@ static int mtk_tx_map(struct sk_buff *sk +@@ -1073,20 +1083,17 @@ static int mtk_tx_map(struct sk_buff *sk tx_buf->flags |= (!mac->id) ? MTK_TX_FLAGS_FPORT0 : MTK_TX_FLAGS_FPORT1; |