Merge branches 'misc' and 'mlx4' into for-next

[~andy/linux] / drivers / net / ethernet / mellanox / mlx4 / main.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index e92cfae82e5accce00bb84e1c3d027353dc2b703..a6ee22b319f8da4a0b859f9506c901daf3b572f4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -1455,16 +1455,11 @@ static int mlx4_setup_hca(struct mlx4_dev *dev)
                                          "ib capabilities (%d). Continuing "
                                          "with caps = 0\n", port, err);
                        dev->caps.ib_port_def_cap[port] = ib_port_default_caps;
+
                        if (mlx4_is_mfunc(dev))
                                dev->caps.port_ib_mtu[port] = IB_MTU_2048;
                        else
                                dev->caps.port_ib_mtu[port] = IB_MTU_4096;
-                       err = mlx4_check_ext_port_caps(dev, port);
-                       if (err)
-                               mlx4_warn(dev, "failed to get port %d extended "
-                                         "port capabilities support info (%d)."
-                                         " Assuming not supported\n",
-                                         port, err);
 
                        err = mlx4_SET_PORT(dev, port);
                        if (err) {