diff options
| author |   Esben Haabendal <esben@geanix.com> | 2024-01-26 10:10:41 +0100 |
|---|---|---|
| committer |   Paolo Abeni <pabeni@redhat.com> | 2024-01-30 12:58:11 +0100 |
| commit | 4896bb7c0b31a0a3379b290ea7729900c59e0c69 (patch) | |
| tree | 194c90271640b00028bd104ab1e1889aecfe7c95 /drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | |
| parent | ipv6: Ensure natural alignment of const ipv6 loopback and router addresses (diff) | |
| download | linux-4896bb7c0b31a0a3379b290ea7729900c59e0c69.tar.xz linux-4896bb7c0b31a0a3379b290ea7729900c59e0c69.zip | |
net: stmmac: do not clear TBS enable bit on link up/down
With the dma conf being reallocated on each call to stmmac_open(), any
information in there is lost, unless we specifically handle it.
The STMMAC_TBS_EN bit is set when adding an etf qdisc, and the etf qdisc
therefore would stop working when link was set down and then back up.
Fixes: ba39b344e924 ("net: ethernet: stmicro: stmmac: generate stmmac dma conf before open")
Cc: stable@vger.kernel.org
Signed-off-by: Esben Haabendal <esben@geanix.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_main.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index b334eb16da23..25519952f754 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3932,6 +3932,9 @@ static int __stmmac_open(struct net_device *dev, priv->rx_copybreak = STMMAC_RX_COPYBREAK; buf_sz = dma_conf->dma_buf_sz; + for (int i = 0; i < MTL_MAX_TX_QUEUES; i++) + if (priv->dma_conf.tx_queue[i].tbs & STMMAC_TBS_EN) + dma_conf->tx_queue[i].tbs = priv->dma_conf.tx_queue[i].tbs; memcpy(&priv->dma_conf, dma_conf, sizeof(*dma_conf)); stmmac_reset_queues_param(priv); |