evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

net/mlx4_en: Change loopback only upon feature change

Browse source 
Currently any change of netdev features results in a call to
mlx4_en_update_loopback_state(). Those calls are unnecessary,
and should be called only upon loopback feature change.

Also moved some of the logic into mlx4_en_update_loopback_state().

Signed-off-by: Ido Shamay <idos@mellanox.com>
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ido Shamay 2015-04-02 16:31:07 +03:00 • committed by David S. Miller
parent 802f42a8d9
commit 241a08c3a7
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/net/ethernet/mellanox/mlx4/en_main.c
View file

@ -103,6 +103,11 @@ void mlx4_en_update_loopback_state(struct net_device *dev,
{ {
struct mlx4_en_priv *priv = netdev_priv(dev); struct mlx4_en_priv *priv = netdev_priv(dev);
if (features & NETIF_F_LOOPBACK)
priv->ctrl_flags |= cpu_to_be32(MLX4_WQE_CTRL_FORCE_LOOPBACK);
else
priv->ctrl_flags &= cpu_to_be32(~MLX4_WQE_CTRL_FORCE_LOOPBACK);
priv->flags &= ~(MLX4_EN_FLAG_RX_FILTER_NEEDED| priv->flags &= ~(MLX4_EN_FLAG_RX_FILTER_NEEDED|
MLX4_EN_FLAG_ENABLE_HW_LOOPBACK); MLX4_EN_FLAG_ENABLE_HW_LOOPBACK);

12
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
View file

@ -2210,13 +2210,11 @@ static int mlx4_en_set_features(struct net_device *netdev,
en_info(priv, "Turn %s TX vlan strip offload\n", en_info(priv, "Turn %s TX vlan strip offload\n",
(features & NETIF_F_HW_VLAN_CTAG_TX) ? "ON" : "OFF"); (features & NETIF_F_HW_VLAN_CTAG_TX) ? "ON" : "OFF");
if (features & NETIF_F_LOOPBACK) if (DEV_FEATURE_CHANGED(netdev, features, NETIF_F_LOOPBACK)) {
priv->ctrl_flags |= cpu_to_be32(MLX4_WQE_CTRL_FORCE_LOOPBACK); en_info(priv, "Turn %s loopback\n",
else (features & NETIF_F_LOOPBACK) ? "ON" : "OFF");
priv->ctrl_flags &= mlx4_en_update_loopback_state(netdev, features);
cpu_to_be32(~MLX4_WQE_CTRL_FORCE_LOOPBACK); }
mlx4_en_update_loopback_state(netdev, features);
return 0; return 0;