Commit cb29688a authored by Or Gerlitz's avatar Or Gerlitz Committed by Roland Dreier
Browse files

mlx4_core: Deprecate log_num_vlan module param 



Enable the maximum size (128) supported by the device for the shadow
vlans table, ignoring the module parameter that overrides it.  This
table is only used by the IBoE control plane for setting a vlan index
into an RC/UC QP context or UD Address Handle.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 80a2dcd8

drivers/net/mlx4/main.c

+6 −5
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ MODULE_PARM_DESC(log_num_mac, "Log2 max number of MACs per ETH port (1-7)"); 
static int log_num_vlan;

module_param_named(log_num_vlan, log_num_vlan, int, 0444);

MODULE_PARM_DESC(log_num_vlan, "Log2 max number of VLANs per ETH port (0-7)");

/* Log2 max number of VLANs per ETH port (0-7) */

#define MLX4_LOG_NUM_VLANS 7



static int use_prio;

module_param_named(use_prio, use_prio, bool, 0444);
@@ -230,7 +232,7 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) 
	dev->caps.max_gso_sz	     = dev_cap->max_gso_sz;



	dev->caps.log_num_macs  = log_num_mac;

	dev->caps.log_num_vlans = log_num_vlan;

	dev->caps.log_num_vlans = MLX4_LOG_NUM_VLANS;

	dev->caps.log_num_prios = use_prio ? 3 : 0;



	for (i = 1; i <= dev->caps.num_ports; ++i) {
@@ -1489,10 +1491,9 @@ static int __init mlx4_verify_params(void) 
		return -1;

	}



	if ((log_num_vlan < 0) || (log_num_vlan > 7)) {

		pr_warning("mlx4_core: bad num_vlan: %d\n", log_num_vlan);

		return -1;

	}

	if (log_num_vlan != 0)

		pr_warning("mlx4_core: log_num_vlan - obsolete module param, using %d\n",

			   MLX4_LOG_NUM_VLANS);



	if ((log_mtts_per_seg < 1) || (log_mtts_per_seg > 7)) {

		pr_warning("mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE