Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9bbfb37 authored by Bodong Wang's avatar Bodong Wang Committed by Saeed Mahameed
Browse files

net/mlx5: Remove unused mlx5_query_nic_vport_vlans 



mlx5_query_nic_vport_vlans() is not used anymore. Hence remove it.
This patch doesn't change any functionality.

Signed-off-by: default avatarBodong Wang <bodong@mellanox.com>
Reviewed-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 0bdddcea

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

+0 −61
Original line number Diff line number Diff line
@@ -371,67 +371,6 @@ int mlx5_modify_nic_vport_mac_list(struct mlx5_core_dev *dev, 
}

EXPORT_SYMBOL_GPL(mlx5_modify_nic_vport_mac_list);



int mlx5_query_nic_vport_vlans(struct mlx5_core_dev *dev,

			       u16 vport,

			       u16 vlans[],

			       int *size)

{

	u32 in[MLX5_ST_SZ_DW(query_nic_vport_context_in)];

	void *nic_vport_ctx;

	int req_list_size;

	int max_list_size;

	int out_sz;

	void *out;

	int err;

	int i;



	req_list_size = *size;

	max_list_size = 1 << MLX5_CAP_GEN(dev, log_max_vlan_list);

	if (req_list_size > max_list_size) {

		mlx5_core_warn(dev, "Requested list size (%d) > (%d) max list size\n",

			       req_list_size, max_list_size);

		req_list_size = max_list_size;

	}



	out_sz = MLX5_ST_SZ_BYTES(modify_nic_vport_context_in) +

			req_list_size * MLX5_ST_SZ_BYTES(vlan_layout);



	memset(in, 0, sizeof(in));

	out = kzalloc(out_sz, GFP_KERNEL);

	if (!out)

		return -ENOMEM;



	MLX5_SET(query_nic_vport_context_in, in, opcode,

		 MLX5_CMD_OP_QUERY_NIC_VPORT_CONTEXT);

	MLX5_SET(query_nic_vport_context_in, in, allowed_list_type,

		 MLX5_NVPRT_LIST_TYPE_VLAN);

	MLX5_SET(query_nic_vport_context_in, in, vport_number, vport);



	if (vport)

		MLX5_SET(query_nic_vport_context_in, in, other_vport, 1);



	err = mlx5_cmd_exec(dev, in, sizeof(in), out, out_sz);

	if (err)

		goto out;



	nic_vport_ctx = MLX5_ADDR_OF(query_nic_vport_context_out, out,

				     nic_vport_context);

	req_list_size = MLX5_GET(nic_vport_context, nic_vport_ctx,

				 allowed_list_size);



	*size = req_list_size;

	for (i = 0; i < req_list_size; i++) {

		void *vlan_addr = MLX5_ADDR_OF(nic_vport_context,

					       nic_vport_ctx,

					       current_uc_mac_address[i]);

		vlans[i] = MLX5_GET(vlan_layout, vlan_addr, vlan);

	}

out:

	kfree(out);

	return err;

}

EXPORT_SYMBOL_GPL(mlx5_query_nic_vport_vlans);



int mlx5_modify_nic_vport_vlans(struct mlx5_core_dev *dev,

				u16 vlans[],

				int list_size)

include/linux/mlx5/vport.h

+0 −4
Original line number Diff line number Diff line
@@ -118,10 +118,6 @@ int mlx5_modify_nic_vport_promisc(struct mlx5_core_dev *mdev, 
				  int promisc_uc,

				  int promisc_mc,

				  int promisc_all);

int mlx5_query_nic_vport_vlans(struct mlx5_core_dev *dev,

			       u16 vport,

			       u16 vlans[],

			       int *size);

int mlx5_modify_nic_vport_vlans(struct mlx5_core_dev *dev,

				u16 vlans[],

				int list_size);