mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
net/mlx4_core: Remove port type restrictions
Port1=Eth, Port2=IB restriction is no longer required. Having RoCE, there will always rdma port initialized over ConnectX physical port, no matter whether the link layer is IB or Ethernet. So we always have dual port IB device. Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c18520bd1b
commit
2207b60ffb
2 changed files with 0 additions and 17 deletions
|
@ -157,9 +157,6 @@ int mlx4_check_port_params(struct mlx4_dev *dev,
|
|||
"on this HCA, aborting.\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
if (port_type[i] == MLX4_PORT_TYPE_ETH &&
|
||||
port_type[i + 1] == MLX4_PORT_TYPE_IB)
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -80,20 +80,6 @@ void mlx4_do_sense_ports(struct mlx4_dev *dev,
|
|||
stype[i - 1] = defaults[i - 1];
|
||||
}
|
||||
|
||||
/*
|
||||
* Adjust port configuration:
|
||||
* If port 1 sensed nothing and port 2 is IB, set both as IB
|
||||
* If port 2 sensed nothing and port 1 is Eth, set both as Eth
|
||||
*/
|
||||
if (stype[0] == MLX4_PORT_TYPE_ETH) {
|
||||
for (i = 1; i < dev->caps.num_ports; i++)
|
||||
stype[i] = stype[i] ? stype[i] : MLX4_PORT_TYPE_ETH;
|
||||
}
|
||||
if (stype[dev->caps.num_ports - 1] == MLX4_PORT_TYPE_IB) {
|
||||
for (i = 0; i < dev->caps.num_ports - 1; i++)
|
||||
stype[i] = stype[i] ? stype[i] : MLX4_PORT_TYPE_IB;
|
||||
}
|
||||
|
||||
/*
|
||||
* If sensed nothing, remain in current configuration.
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue