| From 3ad040aeb34cb0b355601ef8cea614a9b32460f4 Mon Sep 17 00:00:00 2001 |
| From: Jose Abreu <jose.abreu@synopsys.com> |
| Date: Wed, 30 Jan 2019 15:54:21 +0100 |
| Subject: net: stmmac: Disable EEE mode earlier in XMIT callback |
| |
| [ Upstream commit e2cd682deb231ba6f80524bb84e57e7138261149 ] |
| |
| In stmmac xmit callback we use a different flow for TSO packets but TSO |
| xmit callback is not disabling the EEE mode. |
| |
| Fix this by disabling earlier the EEE mode, i.e. before calling the TSO |
| xmit callback. |
| |
| Signed-off-by: Jose Abreu <joabreu@synopsys.com> |
| Cc: Joao Pinto <jpinto@synopsys.com> |
| Cc: David S. Miller <davem@davemloft.net> |
| Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com> |
| Cc: Alexandre Torgue <alexandre.torgue@st.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |
| index 57c56e295705..43ab9e905bed 100644 |
| --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |
| +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c |
| @@ -3028,6 +3028,9 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) |
| |
| tx_q = &priv->tx_queue[queue]; |
| |
| + if (priv->tx_path_in_lpi_mode) |
| + stmmac_disable_eee_mode(priv); |
| + |
| /* Manage oversized TCP frames for GMAC4 device */ |
| if (skb_is_gso(skb) && priv->tso) { |
| if (skb_shinfo(skb)->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6)) { |
| @@ -3055,9 +3058,6 @@ static netdev_tx_t stmmac_xmit(struct sk_buff *skb, struct net_device *dev) |
| return NETDEV_TX_BUSY; |
| } |
| |
| - if (priv->tx_path_in_lpi_mode) |
| - stmmac_disable_eee_mode(priv); |
| - |
| entry = tx_q->cur_tx; |
| first_entry = entry; |
| WARN_ON(tx_q->tx_skbuff[first_entry]); |
| -- |
| 2.19.1 |
| |
