linux-next: manual merge of the infiniband tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/hw/mlx4/main.c between commit 146d6e19832a
("IB/mlx4: Create mirror flows in port aggregation mode") from Linus'
tree and commit e9a7faf11af9 ("IB/mlx4: Fix wrong usage of IPv4
protocol for multicast attach/detach") from the infiniband tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/infiniband/hw/mlx4/main.c
index eb8e215f1613,0b280b1c98df..000000000000
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@@ -1266,12 -1219,10 +1266,11 @@@ static int mlx4_ib_mcg_attach(struct ib
  {
        int err;
        struct mlx4_ib_dev *mdev = to_mdev(ibqp->device);
 +      struct mlx4_dev *dev = mdev->dev;
        struct mlx4_ib_qp *mqp = to_mqp(ibqp);
 -      u64 reg_id;
        struct mlx4_ib_steering *ib_steering = NULL;
-       enum mlx4_protocol prot = (gid->raw[1] == 0x0e) ?
-               MLX4_PROT_IB_IPV4 : MLX4_PROT_IB_IPV6;
+       enum mlx4_protocol prot = MLX4_PROT_IB_IPV6;
 +      struct mlx4_flow_reg_id reg_id;
  
        if (mdev->dev->caps.steering_mode ==
            MLX4_STEERING_MODE_DEVICE_MANAGED) {
@@@ -1283,21 -1234,12 +1282,23 @@@
        err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw, mqp->port,
                                    !!(mqp->flags &
                                       MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
 -                                  prot, &reg_id);
 +                                  prot, &reg_id.id);
-       if (err)
+       if (err) {
+               pr_err("multicast attach op failed, err %d\n", err);
                goto err_malloc;
+       }
  
 +      reg_id.mirror = 0;
 +      if (mlx4_is_bonded(dev)) {
 +              err = mlx4_multicast_attach(mdev->dev, &mqp->mqp, gid->raw,
 +                                          (mqp->port == 1) ? 2 : 1,
 +                                          !!(mqp->flags &
 +                                          
MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
 +                                          prot, &reg_id.mirror);
 +              if (err)
 +                      goto err_add;
 +      }
 +
        err = add_gid_entry(ibqp, gid);
        if (err)
                goto err_add;
@@@ -1347,10 -1285,8 +1348,9 @@@ static int mlx4_ib_mcg_detach(struct ib
        struct mlx4_ib_qp *mqp = to_mqp(ibqp);
        struct net_device *ndev;
        struct mlx4_ib_gid_entry *ge;
 -      u64 reg_id = 0;
 +      struct mlx4_flow_reg_id reg_id = {0, 0};
 +
-       enum mlx4_protocol prot = (gid->raw[1] == 0x0e) ?
-               MLX4_PROT_IB_IPV4 : MLX4_PROT_IB_IPV6;
+       enum mlx4_protocol prot =  MLX4_PROT_IB_IPV6;
  
        if (mdev->dev->caps.steering_mode ==
            MLX4_STEERING_MODE_DEVICE_MANAGED) {

pgpglFLl05JLy.pgp
Description: OpenPGP digital signature