Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2cd682d authored by Jose Abreu's avatar Jose Abreu Committed by David S. Miller
Browse files

net: stmmac: Disable EEE mode earlier in XMIT callback 



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: default avatarJose 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: default avatarDavid S. Miller <davem@davemloft.net>
parent c5acdbee

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+3 −3
Original line number Diff line number Diff line
@@ -3023,6 +3023,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)) {
@@ -3050,9 +3053,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]);