net/mlx4_core: Load the IB driver when the device supports IBoE
authorOr Gerlitz <ogerlitz@mellanox.com>
Wed, 12 Mar 2014 15:16:32 +0000 (17:16 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 12 Mar 2014 20:12:42 +0000 (16:12 -0400)
When checking what protocol drivers to load, the IB driver should be
requested also over Ethernet ports, if the device supports IBoE (RoCE).

Fixes: b046ffe 'net/mlx4_core: Load higher level modules according to ports type'
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/mellanox/mlx4/main.c

index 30a08a60f059c0c4d01c4244cfa74b52e4f18ecc..936c15364739171993bfcb52598bd03f5be8afb6 100644 (file)
@@ -751,7 +751,7 @@ static void mlx4_request_modules(struct mlx4_dev *dev)
                        has_eth_port = true;
        }
 
-       if (has_ib_port)
+       if (has_ib_port || (dev->caps.flags & MLX4_DEV_CAP_FLAG_IBOE))
                request_module_nowait(IB_DRV_NAME);
        if (has_eth_port)
                request_module_nowait(EN_DRV_NAME);