mlx5: implement ethtool::get_fec_stats

[sfrench/cifs-2.6.git] / drivers / net / ethernet / mellanox / mlx5 / core / en_tx.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
index bdbffe484fce4d527d659a5c12f2c9edac54acd1..8ba62671f5f10a0ad475334371a98cbdb4d826d0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
@@ -133,6 +133,8 @@ u16 mlx5e_select_queue(struct net_device *dev, struct sk_buff *skb,
        /* Sync with mlx5e_update_num_tc_x_num_ch - avoid refetching. */
        num_tc_x_num_ch = READ_ONCE(priv->num_tc_x_num_ch);
        if (unlikely(dev->real_num_tx_queues > num_tc_x_num_ch)) {
+               struct mlx5e_ptp *ptp_channel;
+
                /* Order maj_id before defcls - pairs with mlx5e_htb_root_add. */
                u16 htb_maj_id = smp_load_acquire(&priv->htb.maj_id);
 
@@ -142,10 +144,11 @@ u16 mlx5e_select_queue(struct net_device *dev, struct sk_buff *skb,
                                return txq_ix;
                }
 
-               if (unlikely(priv->channels.port_ptp))
-                       if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP) &&
-                           mlx5e_use_ptpsq(skb))
-                               return mlx5e_select_ptpsq(dev, skb);
+               ptp_channel = READ_ONCE(priv->channels.ptp);
+               if (unlikely(ptp_channel) &&
+                   test_bit(MLX5E_PTP_STATE_TX, ptp_channel->state) &&
+                   mlx5e_use_ptpsq(skb))
+                       return mlx5e_select_ptpsq(dev, skb);
 
                txq_ix = netdev_pick_tx(dev, skb, NULL);
                /* Fix netdev_pick_tx() not to choose ptp_channel and HTB txqs.
@@ -576,7 +579,7 @@ static void mlx5e_tx_mpwqe_session_start(struct mlx5e_txqsq *sq,
 
        pi = mlx5e_txqsq_get_next_pi(sq, MLX5E_TX_MPW_MAX_WQEBBS);
        wqe = MLX5E_TX_FETCH_WQE(sq, pi);
-       prefetchw(wqe->data);
+       net_prefetchw(wqe->data);
 
        *session = (struct mlx5e_tx_mpwqe) {
                .wqe = wqe,