diff options
| author | Or Gerlitz <ogerlitz@mellanox.com> | 2015-06-25 11:29:44 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-25 02:06:29 -0700 |
| commit | 7254acffeeec3c0a75b9c5364c29a6eb00014930 (patch) | |
| tree | 528321f5c5c97c74d5b6e74ef6b40d256ba6c9a2 /drivers/net | |
| parent | 79a258526ce1051cb9684018c25a89d51ac21be8 (diff) | |
| download | linux-stable-7254acffeeec3c0a75b9c5364c29a6eb00014930.tar.gz linux-stable-7254acffeeec3c0a75b9c5364c29a6eb00014930.tar.bz2 linux-stable-7254acffeeec3c0a75b9c5364c29a6eb00014930.zip | |
mlx4: Disable HA for SRIOV PF RoCE devices
When in HA mode, the driver exposes an IB (RoCE) device instance with only
one port. Under SRIOV, the existing implementation doesn't go well with
the PF RoCE driver's role of Special QPs Para-Virtualization, etc.
As such, disable HA for the mlx4 PF RoCE device in SRIOV mode.
Fixes: a57500903093 ('IB/mlx4: Add port aggregation support')
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/intf.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/intf.c b/drivers/net/ethernet/mellanox/mlx4/intf.c index 6fce58718837..0d80aed59043 100644 --- a/drivers/net/ethernet/mellanox/mlx4/intf.c +++ b/drivers/net/ethernet/mellanox/mlx4/intf.c @@ -93,8 +93,14 @@ int mlx4_register_interface(struct mlx4_interface *intf) mutex_lock(&intf_mutex); list_add_tail(&intf->list, &intf_list); - list_for_each_entry(priv, &dev_list, dev_list) + list_for_each_entry(priv, &dev_list, dev_list) { + if (mlx4_is_mfunc(&priv->dev) && (intf->flags & MLX4_INTFF_BONDING)) { + mlx4_dbg(&priv->dev, + "SRIOV, disabling HA mode for intf proto %d\n", intf->protocol); + intf->flags &= ~MLX4_INTFF_BONDING; + } mlx4_add_device(intf, priv); + } mutex_unlock(&intf_mutex); |