History

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.

Or Gerlitz committed 15 years ago

Commit cb296881 parent 80a2dcd1 file · +6 −5Browse files

Unified · Split

drivers/net/mlx4/main.c+6−5
@@ -96,6 +96,8 @@ MODULE_PARM_DESC(log_num_mac, "Log2 max number of MACs per ETH port (1-7)"); · 95 unmodified lines
96static int log_num_vlan;96static int log_num_vlan;
97module_param_named(log_num_vlan, log_num_vlan, int, 0444);97module_param_named(log_num_vlan, log_num_vlan, int, 0444);
98MODULE_PARM_DESC(log_num_vlan, "Log2 max number of VLANs per ETH port (0-7)");98MODULE_PARM_DESC(log_num_vlan, "Log2 max number of VLANs per ETH port (0-7)");
99/* Log2 max number of VLANs per ETH port (0-7) */
100#define MLX4_LOG_NUM_VLANS 7
99 101
100static int use_prio;102static int use_prio;
101module_param_named(use_prio, use_prio, bool, 0444);103module_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) · 128 unmodified lines
230 dev->caps.max_gso_sz = dev_cap->max_gso_sz;232 dev->caps.max_gso_sz = dev_cap->max_gso_sz;
231 233
232 dev->caps.log_num_macs = log_num_mac;234 dev->caps.log_num_macs = log_num_mac;
233 dev->caps.log_num_vlans = log_num_vlan;235 dev->caps.log_num_vlans = MLX4_LOG_NUM_VLANS;
234 dev->caps.log_num_prios = use_prio ? 3 : 0;236 dev->caps.log_num_prios = use_prio ? 3 : 0;
235 237
236 for (i = 1; i <= dev->caps.num_ports; ++i) {238 for (i = 1; i <= dev->caps.num_ports; ++i) {
@@ -1489,10 +1491,9 @@ static int __init mlx4_verify_params(void) · 1252 unmodified lines
1489 return -1;1491 return -1;
1490 }1492 }
1491 1493
1492 if ((log_num_vlan < 0) || (log_num_vlan > 7)) {1494 if (log_num_vlan != 0)
1493 pr_warning("mlx4_core: bad num_vlan: %d\n", log_num_vlan);1495 pr_warning("mlx4_core: log_num_vlan - obsolete module param, using %d\n",
1494 return -1;1496 MLX4_LOG_NUM_VLANS);
1495 }
1496 1497
1497 if ((log_mtts_per_seg < 1) || (log_mtts_per_seg > 7)) {1498 if ((log_mtts_per_seg < 1) || (log_mtts_per_seg > 7)) {
1498 pr_warning("mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);1499 pr_warning("mlx4_core: bad log_mtts_per_seg: %d\n", log_mtts_per_seg);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t