diff options
| author | Or Gerlitz <ogerlitz@mellanox.com> | 2014-05-04 17:07:24 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-05 15:48:22 -0400 |
| commit | f24f790f8eb8bca00c66781b21de2a9ff7cd1c00 (patch) | |
| tree | 681a1613bfe6f2b7e6aeae94d056fe30c1f3ddcb /drivers/net/ethernet/mellanox/mlx4 | |
| parent | 0254bc8205195c96b47abe33c67f8ccd2f2dad69 (diff) | |
| download | blackbird-op-linux-f24f790f8eb8bca00c66781b21de2a9ff7cd1c00.tar.gz blackbird-op-linux-f24f790f8eb8bca00c66781b21de2a9ff7cd1c00.zip | |
net/mlx4_core: Load the Eth driver first
When running in SRIOV mode, VM that is assigned with a non-provisioned
Ethernet VFs get themselves a random mac when the Eth driver starts. In
this case, if the IB driver startup code that deals with RoCE runs first,
it will use a zero mac as the source mac for the Para-Virtual CM MADs
which is buggy. To handle that, we change the order of loading.
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index cef267e24f9c..e98c15adb7e2 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -754,10 +754,10 @@ static void mlx4_request_modules(struct mlx4_dev *dev) has_eth_port = true; } - 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); + if (has_ib_port || (dev->caps.flags & MLX4_DEV_CAP_FLAG_IBOE)) + request_module_nowait(IB_DRV_NAME); } /* |
