Commit 4e593262 authored by Joao Pinto's avatar Joao Pinto Committed by David S. Miller

net: stmmac: prepare stmmac_tx_err for multiple queues

This patch prepares stmmac_err for multiple queues.
Signed-off-by: default avatarJoao Pinto <jpinto@synopsys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae4f0d46
...@@ -1525,12 +1525,12 @@ static inline void stmmac_disable_dma_irq(struct stmmac_priv *priv, u32 chan) ...@@ -1525,12 +1525,12 @@ static inline void stmmac_disable_dma_irq(struct stmmac_priv *priv, u32 chan)
/** /**
* stmmac_tx_err - to manage the tx error * stmmac_tx_err - to manage the tx error
* @priv: driver private structure * @priv: driver private structure
* @chan: channel index
* Description: it cleans the descriptors and restarts the transmission * Description: it cleans the descriptors and restarts the transmission
* in case of transmission errors. * in case of transmission errors.
*/ */
static void stmmac_tx_err(struct stmmac_priv *priv) static void stmmac_tx_err(struct stmmac_priv *priv, u32 chan)
{ {
u32 chan = STMMAC_CHAN0;
int i; int i;
netif_stop_queue(priv->dev); netif_stop_queue(priv->dev);
...@@ -1616,7 +1616,7 @@ static void stmmac_dma_interrupt(struct stmmac_priv *priv) ...@@ -1616,7 +1616,7 @@ static void stmmac_dma_interrupt(struct stmmac_priv *priv)
priv->xstats.threshold = tc; priv->xstats.threshold = tc;
} }
} else if (unlikely(status == tx_hard_error)) } else if (unlikely(status == tx_hard_error))
stmmac_tx_err(priv); stmmac_tx_err(priv, chan);
} }
/** /**
...@@ -2944,9 +2944,10 @@ static int stmmac_poll(struct napi_struct *napi, int budget) ...@@ -2944,9 +2944,10 @@ static int stmmac_poll(struct napi_struct *napi, int budget)
static void stmmac_tx_timeout(struct net_device *dev) static void stmmac_tx_timeout(struct net_device *dev)
{ {
struct stmmac_priv *priv = netdev_priv(dev); struct stmmac_priv *priv = netdev_priv(dev);
u32 chan = STMMAC_CHAN0;
/* Clear Tx resources and restart transmitting again */ /* Clear Tx resources and restart transmitting again */
stmmac_tx_err(priv); stmmac_tx_err(priv, chan);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment