Skip to content

Commit

Permalink
mlx4_en: Cancel port_up check in transmit function
Browse files Browse the repository at this point in the history
When closing the port, we stop all transmit queues under the transmit
lock. It ensures that we will not attempt to transmit new packets after
the physical port was closed.

Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Yevgeny Petrilin authored and David S. Miller committed Jun 22, 2009
1 parent a11faac commit 3c05f5e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
4 changes: 2 additions & 2 deletions drivers/net/mlx4/en_netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -700,14 +700,14 @@ void mlx4_en_stop_port(struct net_device *dev)
en_dbg(DRV, priv, "stop port called while port already down\n");
return;
}
netif_tx_stop_all_queues(dev);

/* Synchronize with tx routine */
netif_tx_lock_bh(dev);
priv->port_up = false;
netif_tx_stop_all_queues(dev);
netif_tx_unlock_bh(dev);

/* close port*/
priv->port_up = false;
mlx4_CLOSE_PORT(mdev->dev, priv->port);

/* Unregister Mac address for the port */
Expand Down
7 changes: 0 additions & 7 deletions drivers/net/mlx4/en_tx.c
Original file line number Diff line number Diff line change
Expand Up @@ -646,13 +646,6 @@ int mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_BUSY;
}

/* Now that we know what Tx ring to use */
if (unlikely(!priv->port_up)) {
if (netif_msg_tx_err(priv))
en_warn(priv, "xmit: port down!\n");
goto tx_drop;
}

/* Track current inflight packets for performance analysis */
AVG_PERF_COUNTER(priv->pstats.inflight_avg,
(u32) (ring->prod - ring->cons - 1));
Expand Down

0 comments on commit 3c05f5e

Please sign in to comment.