diff options
| author |   Saeed Mahameed <saeedm@mellanox.com> | 2019-07-04 16:40:32 -0400 |
|---|---|---|
| committer | Saeed Mahameed <saeedm@mellanox.com> | 2019-07-04 16:42:59 -0400 |
| commit | e08a976a16cafc20931db1d17aed9183202bfa8d (patch) | |
| tree | f2bfbc7013305d65f5647d4f8ec7fbd325a93b0a /drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | |
| parent | net: ethernet: mediatek: Fix overlapping capability bits. (diff) | |
| parent | net/mlx5: Add rts2rts_qp_counters_set_id field in hca cap (diff) | |
| download | linux-dev-e08a976a16cafc20931db1d17aed9183202bfa8d.tar.xz linux-dev-e08a976a16cafc20931db1d17aed9183202bfa8d.zip | |
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Misc updates from mlx5-next branch:
1) Add the required HW definitions and structures for upcoming TLS
support.
2) Add support for MCQI and MCQS hardware registers for fw version query.
3) Added hardware bits and structures definitions for sub-functions
4) Small code cleanup and improvement for PF pci driver.
5) Bluefield (ECPF) updates and refactoring for better E-Switch
management on ECPF embedded CPU NIC:
5.1) Consolidate querying eswitch number of VFs
5.2) Register event handler at the correct E-Switch init stage
5.3) Setup PF's inline mode and vlan pop when the ECPF is the
E-Swtich manager ( the host PF is basically a VF ).
5.4) Handle Vport UC address changes in switchdev mode.
6) Cleanup the rep and netdev reference when unloading IB rep.
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
i# All conflicts fixed but you are still merging.
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_rep.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index 330034fcdfc5..6c623efb76e4 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c @@ -398,7 +398,7 @@ static int mlx5e_rep_get_port_parent_id(struct net_device *dev, priv = netdev_priv(dev); esw = priv->mdev->priv.eswitch; - if (esw->mode == SRIOV_NONE) + if (esw->mode == MLX5_ESWITCH_NONE) return -EOPNOTSUPP; parent_id = mlx5_query_nic_system_image_guid(priv->mdev); @@ -414,7 +414,7 @@ static void mlx5e_sqs2vport_stop(struct mlx5_eswitch *esw, struct mlx5e_rep_sq *rep_sq, *tmp; struct mlx5e_rep_priv *rpriv; - if (esw->mode != SRIOV_OFFLOADS) + if (esw->mode != MLX5_ESWITCH_OFFLOADS) return; rpriv = mlx5e_rep_to_rep_priv(rep); @@ -435,7 +435,7 @@ static int mlx5e_sqs2vport_start(struct mlx5_eswitch *esw, int err; int i; - if (esw->mode != SRIOV_OFFLOADS) + if (esw->mode != MLX5_ESWITCH_OFFLOADS) return 0; rpriv = mlx5e_rep_to_rep_priv(rep); @@ -1392,7 +1392,7 @@ static void mlx5e_build_rep_netdev(struct net_device *netdev) SET_NETDEV_DEV(netdev, mdev->device); netdev->netdev_ops = &mlx5e_netdev_ops_uplink_rep; /* we want a persistent mac for the uplink rep */ - mlx5_query_nic_vport_mac_address(mdev, 0, netdev->dev_addr); + mlx5_query_mac_address(mdev, netdev->dev_addr); netdev->ethtool_ops = &mlx5e_uplink_rep_ethtool_ops; #ifdef CONFIG_MLX5_CORE_EN_DCB if (MLX5_CAP_GEN(mdev, qos)) |