Commit 84db6612 authored by Roi Dayan's avatar Roi Dayan Committed by Saeed Mahameed
Browse files

net/mlx5e: Move set vxlan nic info to profile init 



Since its profile dependent let's init the vxlan info
as part of profile initialization.

Signed-off-by: default avatarRoi Dayan <roid@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 1227bbc5

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+1 −2
Original line number Diff line number Diff line
@@ -5101,8 +5101,6 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
	netdev->hw_features      |= NETIF_F_HW_VLAN_CTAG_FILTER;

	netdev->hw_features      |= NETIF_F_HW_VLAN_STAG_TX;



	mlx5e_vxlan_set_netdev_info(priv);



	if (mlx5e_tunnel_any_tx_proto_supported(mdev)) {

		netdev->hw_enc_features |= NETIF_F_HW_CSUM;

		netdev->hw_enc_features |= NETIF_F_TSO;
@@ -5229,6 +5227,7 @@ static int mlx5e_nic_init(struct mlx5_core_dev *mdev, 
	int err;



	mlx5e_build_nic_params(priv, &priv->xsk, netdev->mtu);

	mlx5e_vxlan_set_netdev_info(priv);



	mlx5e_timestamp_init(priv);

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+10 −4
Original line number Diff line number Diff line
@@ -717,15 +717,12 @@ static void mlx5e_build_rep_netdev(struct net_device *netdev, 
				   struct mlx5_core_dev *mdev,

				   struct mlx5_eswitch_rep *rep)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);



	SET_NETDEV_DEV(netdev, mdev->device);

	if (rep->vport == MLX5_VPORT_UPLINK) {

		netdev->netdev_ops = &mlx5e_netdev_ops_uplink_rep;

		/* we want a persistent mac for the uplink rep */

		mlx5_query_mac_address(mdev, netdev->dev_addr);

		netdev->ethtool_ops = &mlx5e_uplink_rep_ethtool_ops;

		mlx5e_vxlan_set_netdev_info(priv);

		mlx5e_dcbnl_build_rep_netdev(netdev);

	} else {

		netdev->netdev_ops = &mlx5e_netdev_ops_rep;
@@ -767,6 +764,15 @@ static int mlx5e_init_rep(struct mlx5_core_dev *mdev, 
	return 0;

}



static int mlx5e_init_ul_rep(struct mlx5_core_dev *mdev,

			     struct net_device *netdev)

{

	struct mlx5e_priv *priv = netdev_priv(netdev);



	mlx5e_vxlan_set_netdev_info(priv);

	return mlx5e_init_rep(mdev, netdev);

}



static void mlx5e_cleanup_rep(struct mlx5e_priv *priv)

{

}
@@ -1165,7 +1171,7 @@ static const struct mlx5e_profile mlx5e_rep_profile = { 
};



static const struct mlx5e_profile mlx5e_uplink_rep_profile = {

	.init			= mlx5e_init_rep,

	.init			= mlx5e_init_ul_rep,

	.cleanup		= mlx5e_cleanup_rep,

	.init_rx		= mlx5e_init_ul_rep_rx,

	.cleanup_rx		= mlx5e_cleanup_ul_rep_rx,