Commit 4b5e5b7e authored by Alaa Hleihel's avatar Alaa Hleihel Committed by David S. Miller

net/mlx4_core: Get num_tc using netdev_get_num_tc

Avoid reading num_tc directly from struct net_device, but use
the helper function netdev_get_num_tc.

Fixes: bc6a4744 ("net/mlx4_en: num cores tx rings for every UP")
Fixes: f5b6345b ("net/mlx4_en: User prio mapping gets corrupted when changing number of channels")
Signed-off-by: default avatarAlaa Hleihel <alaa@mellanox.com>
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae5a2e29
...@@ -1788,7 +1788,7 @@ static int mlx4_en_set_channels(struct net_device *dev, ...@@ -1788,7 +1788,7 @@ static int mlx4_en_set_channels(struct net_device *dev,
netif_set_real_num_tx_queues(dev, priv->tx_ring_num[TX]); netif_set_real_num_tx_queues(dev, priv->tx_ring_num[TX]);
netif_set_real_num_rx_queues(dev, priv->rx_ring_num); netif_set_real_num_rx_queues(dev, priv->rx_ring_num);
if (dev->num_tc) if (netdev_get_num_tc(dev))
mlx4_en_setup_tc(dev, MLX4_EN_NUM_UP); mlx4_en_setup_tc(dev, MLX4_EN_NUM_UP);
en_warn(priv, "Using %d TX rings\n", priv->tx_ring_num[TX]); en_warn(priv, "Using %d TX rings\n", priv->tx_ring_num[TX]);
......
...@@ -710,7 +710,7 @@ u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb, ...@@ -710,7 +710,7 @@ u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb,
u16 rings_p_up = priv->num_tx_rings_p_up; u16 rings_p_up = priv->num_tx_rings_p_up;
u8 up = 0; u8 up = 0;
if (dev->num_tc) if (netdev_get_num_tc(dev))
return skb_tx_hash(dev, skb); return skb_tx_hash(dev, skb);
if (skb_vlan_tag_present(skb)) if (skb_vlan_tag_present(skb))
......
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