projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 5.15 to 5.15.148
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
backport-5.15
/
775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
diff --git
a/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
b/target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
index 3c10819b681375a769aa4a0643aabd636bfe4707..931c589cfa390880debe624614bbd9ba2355382c 100644
(file)
--- a/
target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
+++ b/
target/linux/generic/backport-5.15/775-v6.0-01-net-ethernet-stmicro-stmmac-move-queue-reset-to-dedi.patch
@@
-62,7
+62,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
tx_q->dma_tx_phy, chan);
stmmac_start_tx_dma(priv, chan);
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
tx_q->dma_tx_phy, chan);
stmmac_start_tx_dma(priv, chan);
-@@ -378
2,6 +3773
,8 @@ static int stmmac_open(struct net_device
+@@ -378
3,6 +3774
,8 @@ static int stmmac_open(struct net_device
}
}
}
}
@@
-71,7
+71,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
ret = stmmac_hw_setup(dev, true);
if (ret < 0) {
netdev_err(priv->dev, "%s: Hw setup failed\n", __func__);
ret = stmmac_hw_setup(dev, true);
if (ret < 0) {
netdev_err(priv->dev, "%s: Hw setup failed\n", __func__);
-@@ -64
29,6 +6422
,7 @@ void stmmac_enable_rx_queue(struct stmma
+@@ -64
30,6 +6423
,7 @@ void stmmac_enable_rx_queue(struct stmma
return;
}
return;
}
@@
-79,7
+79,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
stmmac_clear_rx_descriptors(priv, queue);
stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
stmmac_clear_rx_descriptors(priv, queue);
stmmac_init_rx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
-@@ -649
0,6 +6484
,7 @@ void stmmac_enable_tx_queue(struct stmma
+@@ -649
1,6 +6485
,7 @@ void stmmac_enable_tx_queue(struct stmma
return;
}
return;
}
@@
-87,7
+87,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
stmmac_clear_tx_descriptors(priv, queue);
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
stmmac_clear_tx_descriptors(priv, queue);
stmmac_init_tx_chan(priv, priv->ioaddr, priv->plat->dma_cfg,
-@@ -741
4,6 +7409
,25 @@ int stmmac_suspend(struct device *dev)
+@@ -741
5,6 +7410
,25 @@ int stmmac_suspend(struct device *dev)
}
EXPORT_SYMBOL_GPL(stmmac_suspend);
}
EXPORT_SYMBOL_GPL(stmmac_suspend);
@@
-113,7
+113,7
@@
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
/**
* stmmac_reset_queues_param - reset queue parameters
* @priv: device pointer
/**
* stmmac_reset_queues_param - reset queue parameters
* @priv: device pointer
-@@ -742
4,22 +7438
,11 @@ static void stmmac_reset_queues_param(st
+@@ -742
5,22 +7439
,11 @@ static void stmmac_reset_queues_param(st
u32 tx_cnt = priv->plat->tx_queues_to_use;
u32 queue;
u32 tx_cnt = priv->plat->tx_queues_to_use;
u32 queue;