linux-next: manual merge of the net-next tree with the infiniband tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jack Morgenstein <jackm@dev.mellanox.co.il>,
	Roland Dreier <roland@kernel.org>,
	linux-rdma@vger.kernel.org,
	Hadar Hen Zion <hadarh@mellanox.co.il>,
	Or Gerlitz <ogerlitz@mellanox.com>
Subject: linux-next: manual merge of the net-next tree with the infiniband tree
Date: Thu, 12 Jul 2012 12:09:50 +1000	[thread overview]
Message-ID: <20120712120950.223be053857381046b7d5db6@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1561 bytes --]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/mellanox/mlx4/main.c between commit 6634961c14d3
("mlx4: Put physical GID and P_Key table sizes in mlx4_phys_caps struct
and paravirtualize them") from the infiniband tree and commit
0ff1fb654bec ("{NET, IB}/mlx4: Add device managed flow steering firmware
API") from the net-next tree.

Just context changes (I think).  I have fixed it up (see below) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
index 5df3ac4,4264516..0000000

--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@@ -1232,10 -1231,26 +1258,29 @@@ static int mlx4_init_hca(struct mlx4_de
  			goto err_stop_fw;
  		}
  
 +		if (mlx4_is_master(dev))
 +			mlx4_parav_master_pf_caps(dev);
 +
+ 		priv->fs_hash_mode = MLX4_FS_L2_HASH;
+ 
+ 		switch (priv->fs_hash_mode) {
+ 		case MLX4_FS_L2_HASH:
+ 			init_hca.fs_hash_enable_bits = 0;
+ 			break;
+ 
+ 		case MLX4_FS_L2_L3_L4_HASH:
+ 			/* Enable flow steering with
+ 			 * udp unicast and tcp unicast
+ 			 */
+ 			init_hca.fs_hash_enable_bits =
+ 				MLX4_FS_UDP_UC_EN | MLX4_FS_TCP_UC_EN;
+ 			break;
+ 		}
+ 
  		profile = default_profile;
+ 		if (dev->caps.steering_mode ==
+ 		    MLX4_STEERING_MODE_DEVICE_MANAGED)
+ 			profile.num_mcg = MLX4_FS_NUM_MCG;
  
  		icm_size = mlx4_make_profile(dev, &profile, &dev_cap,
  					     &init_hca);

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
