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

net/mlx5e: Refactor mlx5e_netdev_init/cleanup to mlx5e_priv_init/cleanup 



We actually initialize priv and not netdev. The only call to
set netdev carrier will be moved in the following commit.

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

drivers/net/ethernet/mellanox/mlx5/core/en.h

+4 −4
Original line number Diff line number Diff line
@@ -1160,10 +1160,10 @@ mlx5e_calc_max_nch(struct mlx5e_priv *priv, const struct mlx5e_profile *profile) 
	return priv->netdev->num_rx_queues / max_t(u8, profile->rq_groups, 1);

}



int mlx5e_netdev_init(struct net_device *netdev,

		      struct mlx5e_priv *priv,

int mlx5e_priv_init(struct mlx5e_priv *priv,

		    struct net_device *netdev,

		    struct mlx5_core_dev *mdev);

void mlx5e_netdev_cleanup(struct net_device *netdev, struct mlx5e_priv *priv);

void mlx5e_priv_cleanup(struct mlx5e_priv *priv);

struct net_device *

mlx5e_create_netdev(struct mlx5_core_dev *mdev, unsigned int txqs, unsigned int rxqs);

int mlx5e_attach_netdev(struct mlx5e_priv *priv);

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

+10 −10
Original line number Diff line number Diff line
@@ -5457,8 +5457,8 @@ static const struct mlx5e_profile mlx5e_nic_profile = { 
};



/* mlx5e generic netdev management API (move to en_common.c) */

int mlx5e_netdev_init(struct net_device *netdev,

		      struct mlx5e_priv *priv,

int mlx5e_priv_init(struct mlx5e_priv *priv,

		    struct net_device *netdev,

		    struct mlx5_core_dev *mdev)

{

	memset(priv, 0, sizeof(*priv));
@@ -5494,7 +5494,7 @@ int mlx5e_netdev_init(struct net_device *netdev, 
	return -ENOMEM;

}



void mlx5e_netdev_cleanup(struct net_device *netdev, struct mlx5e_priv *priv)

void mlx5e_priv_cleanup(struct mlx5e_priv *priv)

{

	int i;
@@ -5518,9 +5518,9 @@ mlx5e_create_netdev(struct mlx5_core_dev *mdev, unsigned int txqs, unsigned int 
		return NULL;

	}



	err = mlx5e_netdev_init(netdev, netdev_priv(netdev), mdev);

	err = mlx5e_priv_init(netdev_priv(netdev), netdev, mdev);

	if (err) {

		mlx5_core_err(mdev, "mlx5e_netdev_init failed, err=%d\n", err);

		mlx5_core_err(mdev, "mlx5e_priv_init failed, err=%d\n", err);

		goto err_free_netdev;

	}

	dev_net_set(netdev, mlx5_core_net(mdev));
@@ -5625,9 +5625,9 @@ mlx5e_netdev_attach_profile(struct mlx5e_priv *priv, 
	struct mlx5_core_dev *mdev = priv->mdev;

	int err;



	err = mlx5e_netdev_init(netdev, priv, mdev);

	err = mlx5e_priv_init(priv, netdev, mdev);

	if (err) {

		mlx5_core_err(mdev, "mlx5e_netdev_init failed, err=%d\n", err);

		mlx5_core_err(mdev, "mlx5e_priv_init failed, err=%d\n", err);

		return err;

	}

	priv->profile = new_profile;
@@ -5660,7 +5660,7 @@ int mlx5e_netdev_change_profile(struct mlx5e_priv *priv, 
	/* cleanup old profile */

	mlx5e_detach_netdev(priv);

	priv->profile->cleanup(priv);

	mlx5e_netdev_cleanup(priv->netdev, priv);

	mlx5e_priv_cleanup(priv);



	err = mlx5e_netdev_attach_profile(priv, new_profile, new_ppriv);

	if (err) { /* roll back to original profile */
@@ -5685,7 +5685,7 @@ void mlx5e_destroy_netdev(struct mlx5e_priv *priv) 
{

	struct net_device *netdev = priv->netdev;



	mlx5e_netdev_cleanup(netdev, priv);

	mlx5e_priv_cleanup(priv);

	free_netdev(netdev);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ int mlx5i_init(struct mlx5_core_dev *mdev, struct net_device *netdev) 
/* Called directly before IPoIB netdevice is destroyed to cleanup SW structs */

void mlx5i_cleanup(struct mlx5e_priv *priv)

{

	mlx5e_netdev_cleanup(priv->netdev, priv);

	mlx5e_priv_cleanup(priv);

}



static void mlx5i_grp_sw_update_stats(struct mlx5e_priv *priv)
@@ -744,7 +744,7 @@ static int mlx5_rdma_setup_rn(struct ib_device *ibdev, u8 port_num, 
			goto destroy_ht;

	}



	err = mlx5e_netdev_init(netdev, epriv, mdev);

	err = mlx5e_priv_init(epriv, netdev, mdev);

	if (err)

		goto destroy_mdev_resources;