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

2015-02-17 Thread 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 Rothwells...@canb.auug.org.au

diff --cc drivers/infiniband/hw/mlx4/main.c
index eb8e215f1613,0b280b1c98df..
--- 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, gid->raw, mqp->port,
!!(mqp->flags &
   MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
 -  prot, _id);
 +  prot, _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, gid->raw,
 +  (mqp->port == 1) ? 2 : 1,
 +  !!(mqp->flags &
 +  
MLX4_IB_QP_BLOCK_MULTICAST_LOOPBACK),
 +  prot, _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) {


pgpadlo9o5M7l.pgp
Description: OpenPGP digital signature

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

2015-02-17 Thread 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 Rothwells...@canb.auug.org.au

diff --cc drivers/infiniband/hw/mlx4/main.c
index eb8e215f1613,0b280b1c98df..
--- 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) {


pgpadlo9o5M7l.pgp
Description: OpenPGP digital signature

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

2014-12-15 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/hw/mlx5/mr.c between commit 479163f46082 ("mlx5:
don't duplicate kvfree()") from Linus' tree and commit 89c925949c1f
("IB/mlx5: Implement on demand paging by adding support for MMU
notifiers") from the infiniband tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/infiniband/hw/mlx5/mr.c
index 5a80dd993761,a2dd7bfc129b..
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@@ -856,7 -1009,8 +1012,8 @@@ static struct mlx5_ib_mr *reg_create(st
goto err_2;
}
mr->umem = umem;
+   mr->live = 1;
 -  mlx5_vfree(in);
 +  kvfree(in);
  
mlx5_ib_dbg(dev, "mkey = 0x%x\n", mr->mmr.key);
  


pgpxStP5IIXtz.pgp
Description: OpenPGP digital signature

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

2014-12-15 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/hw/mlx5/mr.c between commit 479163f46082 (mlx5:
don't duplicate kvfree()) from Linus' tree and commit 89c925949c1f
(IB/mlx5: Implement on demand paging by adding support for MMU
notifiers) from the infiniband tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/infiniband/hw/mlx5/mr.c
index 5a80dd993761,a2dd7bfc129b..
--- a/drivers/infiniband/hw/mlx5/mr.c
+++ b/drivers/infiniband/hw/mlx5/mr.c
@@@ -856,7 -1009,8 +1012,8 @@@ static struct mlx5_ib_mr *reg_create(st
goto err_2;
}
mr-umem = umem;
+   mr-live = 1;
 -  mlx5_vfree(in);
 +  kvfree(in);
  
mlx5_ib_dbg(dev, mkey = 0x%x\n, mr-mmr.key);
  


pgpxStP5IIXtz.pgp
Description: OpenPGP digital signature

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

2014-10-14 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/hw/mlx5/qp.c between commit c7a08ac7ee68
("net/mlx5_core: Update device capabilities handling") from Linus' tree
and commit f83b42636a91 ("IB/mlx5: Remove duplicate code from
mlx5_set_path") from the infiniband tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/infiniband/hw/mlx5/qp.c
index dbfe498870c1,f1b49e024664..
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@@ -1317,6 -1302,11 +1317,11 @@@ static int mlx5_set_path(struct mlx5_ib
path->rlid  = cpu_to_be16(ah->dlid);
  
if (ah->ah_flags & IB_AH_GRH) {
 -  if (ah->grh.sgid_index >= dev->mdev->caps.port[port - 
1].gid_table_len) {
++  if (ah->grh.sgid_index >= gen->port[port - 1].gid_table_len) {
+   pr_err(KERN_ERR "sgid_index (%u) too large. max is 
%d\n",
 - ah->grh.sgid_index, dev->mdev->caps.port[port - 
1].gid_table_len);
++ ah->grh.sgid_index, gen->port[port - 
1].gid_table_len);
+   return -EINVAL;
+   }
path->grh_mlid |= 1 << 7;
path->mgid_index = ah->grh.sgid_index;
path->hop_limit  = ah->grh.hop_limit;


signature.asc
Description: PGP signature

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

2014-10-14 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/hw/mlx5/qp.c between commit c7a08ac7ee68
(net/mlx5_core: Update device capabilities handling) from Linus' tree
and commit f83b42636a91 (IB/mlx5: Remove duplicate code from
mlx5_set_path) from the infiniband tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/infiniband/hw/mlx5/qp.c
index dbfe498870c1,f1b49e024664..
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@@ -1317,6 -1302,11 +1317,11 @@@ static int mlx5_set_path(struct mlx5_ib
path-rlid  = cpu_to_be16(ah-dlid);
  
if (ah-ah_flags  IB_AH_GRH) {
 -  if (ah-grh.sgid_index = dev-mdev-caps.port[port - 
1].gid_table_len) {
++  if (ah-grh.sgid_index = gen-port[port - 1].gid_table_len) {
+   pr_err(KERN_ERR sgid_index (%u) too large. max is 
%d\n,
 - ah-grh.sgid_index, dev-mdev-caps.port[port - 
1].gid_table_len);
++ ah-grh.sgid_index, gen-port[port - 
1].gid_table_len);
+   return -EINVAL;
+   }
path-grh_mlid |= 1  7;
path-mgid_index = ah-grh.sgid_index;
path-hop_limit  = ah-grh.hop_limit;


signature.asc
Description: PGP signature

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

2013-02-25 Thread Or Gerlitz 

On 26/02/2013 02:45, Stephen Rothwell wrote:

Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d
("net/mlx4_core: Use firmware driven flow steering hash mode") from
Linus' tree and commit e448834e3545 ("mlx4_core: Enable memory windows in
{INIT, QUERY}_HCA") from the infiniband tree.

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



thanks,

Acked-by: Or Gerlitz 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-02-25 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d
("net/mlx4_core: Use firmware driven flow steering hash mode") from
Linus' tree and commit e448834e3545 ("mlx4_core: Enable memory windows in
{INIT, QUERY}_HCA") from the infiniband tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4.h
index ed4a695,8b75d5e..000
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@@ -60,6 -60,13 +60,8 @@@
  #define MLX4_FS_MGM_LOG_ENTRY_SIZE7
  #define MLX4_FS_NUM_MCG   (1 << 17)
  
+ #define INIT_HCA_TPT_MW_ENABLE  (1 << 7)
+ 
 -enum {
 -  MLX4_FS_L2_HASH = 0,
 -  MLX4_FS_L2_L3_L4_HASH,
 -};
 -
  #define MLX4_NUM_UP   8
  #define MLX4_NUM_TC   8
  #define MLX4_RATELIMIT_UNITS 3 /* 100 Mbps */


pgpFbsvgrkCpc.pgp
Description: PGP signature

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

2013-02-25 Thread Or Gerlitz 

On 26/02/2013 02:45, Stephen Rothwell wrote:

Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d
(net/mlx4_core: Use firmware driven flow steering hash mode) from
Linus' tree and commit e448834e3545 (mlx4_core: Enable memory windows in
{INIT, QUERY}_HCA) from the infiniband tree.

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



thanks,

Acked-by: Or Gerlitz ogerl...@mellanox.com
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-02-25 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit 23537b732f5d
(net/mlx4_core: Use firmware driven flow steering hash mode) from
Linus' tree and commit e448834e3545 (mlx4_core: Enable memory windows in
{INIT, QUERY}_HCA) from the infiniband tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4.h
index ed4a695,8b75d5e..000
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@@ -60,6 -60,13 +60,8 @@@
  #define MLX4_FS_MGM_LOG_ENTRY_SIZE7
  #define MLX4_FS_NUM_MCG   (1  17)
  
+ #define INIT_HCA_TPT_MW_ENABLE  (1  7)
+ 
 -enum {
 -  MLX4_FS_L2_HASH = 0,
 -  MLX4_FS_L2_L3_L4_HASH,
 -};
 -
  #define MLX4_NUM_UP   8
  #define MLX4_NUM_TC   8
  #define MLX4_RATELIMIT_UNITS 3 /* 100 Mbps */


pgpFbsvgrkCpc.pgp
Description: PGP signature

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

2013-02-22 Thread Or Gerlitz 
On Fri, Feb 22, 2013 at 2:50 AM, Stephen Rothwell  wrote:
>
> Hi all,
>
> Today's linux-next merge of the infiniband tree got a conflict in
> drivers/infiniband/ulp/ipoib/ipoib_ethtool.c between commit 7826d43f2db4
> ("ethtool: fix drvinfo strings set in drivers") from the  tree and commit
> 4b48680b5572 ("IPoIB: Add version and firmware info to ethtool
> reporting") from the infiniband tree.
>
> I fixed it up (using the latter version as it included the change to use
> strlcpy) and can carry the fix as necessary (no action is required).

thanks for fixing thay up!

Acked-by: Or Gerlitz 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-02-22 Thread Or Gerlitz 
On Fri, Feb 22, 2013 at 2:50 AM, Stephen Rothwell s...@canb.auug.org.au wrote:

 Hi all,

 Today's linux-next merge of the infiniband tree got a conflict in
 drivers/infiniband/ulp/ipoib/ipoib_ethtool.c between commit 7826d43f2db4
 (ethtool: fix drvinfo strings set in drivers) from the  tree and commit
 4b48680b5572 (IPoIB: Add version and firmware info to ethtool
 reporting) from the infiniband tree.

 I fixed it up (using the latter version as it included the change to use
 strlcpy) and can carry the fix as necessary (no action is required).

thanks for fixing thay up!

Acked-by: Or Gerlitz ogerl...@mellanox.com
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-02-21 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c between commit 7826d43f2db4
("ethtool: fix drvinfo strings set in drivers") from the  tree and commit
4b48680b5572 ("IPoIB: Add version and firmware info to ethtool
reporting") from the infiniband tree.

I fixed it up (using the latter version as it included the change to use
strlcpy) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpdSUPsDmCjK.pgp
Description: PGP signature

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

2013-02-21 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/ulp/ipoib/ipoib_ethtool.c between commit 7826d43f2db4
(ethtool: fix drvinfo strings set in drivers) from the  tree and commit
4b48680b5572 (IPoIB: Add version and firmware info to ethtool
reporting) from the infiniband tree.

I fixed it up (using the latter version as it included the change to use
strlcpy) and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpdSUPsDmCjK.pgp
Description: PGP signature

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

2012-09-27 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit a8edc3bf05a3
("net/mlx4_core: Put Firmware flow steering structures in common header
files") from Linus' tree and commit 6b6f29c687ce ("mlx4_core: Stash PCI
ID driver_data in mlx4_priv structure") from the infiniband tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4.h
index dba69d9,f7156b7..000
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@@ -690,82 -692,11 +692,87 @@@ struct mlx4_steer 
struct list_head steer_entries[MLX4_NUM_STEERS];
  };
  
 +struct mlx4_net_trans_rule_hw_ctrl {
 +  __be32 ctrl;
 +  __be32 vf_vep_port;
 +  __be32 qpn;
 +  __be32 reserved;
 +};
 +
 +struct mlx4_net_trans_rule_hw_ib {
 +  u8 size;
 +  u8 rsvd1;
 +  __be16 id;
 +  u32 rsvd2;
 +  __be32 qpn;
 +  __be32 qpn_mask;
 +  u8 dst_gid[16];
 +  u8 dst_gid_msk[16];
 +} __packed;
 +
 +struct mlx4_net_trans_rule_hw_eth {
 +  u8  size;
 +  u8  rsvd;
 +  __be16  id;
 +  u8  rsvd1[6];
 +  u8  dst_mac[6];
 +  u16 rsvd2;
 +  u8  dst_mac_msk[6];
 +  u16 rsvd3;
 +  u8  src_mac[6];
 +  u16 rsvd4;
 +  u8  src_mac_msk[6];
 +  u8  rsvd5;
 +  u8  ether_type_enable;
 +  __be16  ether_type;
 +  __be16  vlan_id_msk;
 +  __be16  vlan_id;
 +} __packed;
 +
 +struct mlx4_net_trans_rule_hw_tcp_udp {
 +  u8  size;
 +  u8  rsvd;
 +  __be16  id;
 +  __be16  rsvd1[3];
 +  __be16  dst_port;
 +  __be16  rsvd2;
 +  __be16  dst_port_msk;
 +  __be16  rsvd3;
 +  __be16  src_port;
 +  __be16  rsvd4;
 +  __be16  src_port_msk;
 +} __packed;
 +
 +struct mlx4_net_trans_rule_hw_ipv4 {
 +  u8  size;
 +  u8  rsvd;
 +  __be16  id;
 +  __be32  rsvd1;
 +  __be32  dst_ip;
 +  __be32  dst_ip_msk;
 +  __be32  src_ip;
 +  __be32  src_ip_msk;
 +} __packed;
 +
 +struct _rule_hw {
 +  union {
 +  struct {
 +  u8 size;
 +  u8 rsvd;
 +  __be16 id;
 +  };
 +  struct mlx4_net_trans_rule_hw_eth eth;
 +  struct mlx4_net_trans_rule_hw_ib ib;
 +  struct mlx4_net_trans_rule_hw_ipv4 ipv4;
 +  struct mlx4_net_trans_rule_hw_tcp_udp tcp_udp;
 +  };
 +};
 +
+ enum {
+   MLX4_PCI_DEV_IS_VF  = 1 << 0,
+   MLX4_PCI_DEV_FORCE_SENSE_PORT   = 1 << 1,
+ };
+ 
  struct mlx4_priv {
struct mlx4_dev dev;
  


pgpUxugdSd7e0.pgp
Description: PGP signature

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

2012-09-27 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/net/ethernet/mellanox/mlx4/mlx4.h between commit a8edc3bf05a3
(net/mlx4_core: Put Firmware flow steering structures in common header
files) from Linus' tree and commit 6b6f29c687ce (mlx4_core: Stash PCI
ID driver_data in mlx4_priv structure) from the infiniband tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/net/ethernet/mellanox/mlx4/mlx4.h
index dba69d9,f7156b7..000
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h
@@@ -690,82 -692,11 +692,87 @@@ struct mlx4_steer 
struct list_head steer_entries[MLX4_NUM_STEERS];
  };
  
 +struct mlx4_net_trans_rule_hw_ctrl {
 +  __be32 ctrl;
 +  __be32 vf_vep_port;
 +  __be32 qpn;
 +  __be32 reserved;
 +};
 +
 +struct mlx4_net_trans_rule_hw_ib {
 +  u8 size;
 +  u8 rsvd1;
 +  __be16 id;
 +  u32 rsvd2;
 +  __be32 qpn;
 +  __be32 qpn_mask;
 +  u8 dst_gid[16];
 +  u8 dst_gid_msk[16];
 +} __packed;
 +
 +struct mlx4_net_trans_rule_hw_eth {
 +  u8  size;
 +  u8  rsvd;
 +  __be16  id;
 +  u8  rsvd1[6];
 +  u8  dst_mac[6];
 +  u16 rsvd2;
 +  u8  dst_mac_msk[6];
 +  u16 rsvd3;
 +  u8  src_mac[6];
 +  u16 rsvd4;
 +  u8  src_mac_msk[6];
 +  u8  rsvd5;
 +  u8  ether_type_enable;
 +  __be16  ether_type;
 +  __be16  vlan_id_msk;
 +  __be16  vlan_id;
 +} __packed;
 +
 +struct mlx4_net_trans_rule_hw_tcp_udp {
 +  u8  size;
 +  u8  rsvd;
 +  __be16  id;
 +  __be16  rsvd1[3];
 +  __be16  dst_port;
 +  __be16  rsvd2;
 +  __be16  dst_port_msk;
 +  __be16  rsvd3;
 +  __be16  src_port;
 +  __be16  rsvd4;
 +  __be16  src_port_msk;
 +} __packed;
 +
 +struct mlx4_net_trans_rule_hw_ipv4 {
 +  u8  size;
 +  u8  rsvd;
 +  __be16  id;
 +  __be32  rsvd1;
 +  __be32  dst_ip;
 +  __be32  dst_ip_msk;
 +  __be32  src_ip;
 +  __be32  src_ip_msk;
 +} __packed;
 +
 +struct _rule_hw {
 +  union {
 +  struct {
 +  u8 size;
 +  u8 rsvd;
 +  __be16 id;
 +  };
 +  struct mlx4_net_trans_rule_hw_eth eth;
 +  struct mlx4_net_trans_rule_hw_ib ib;
 +  struct mlx4_net_trans_rule_hw_ipv4 ipv4;
 +  struct mlx4_net_trans_rule_hw_tcp_udp tcp_udp;
 +  };
 +};
 +
+ enum {
+   MLX4_PCI_DEV_IS_VF  = 1  0,
+   MLX4_PCI_DEV_FORCE_SENSE_PORT   = 1  1,
+ };
+ 
  struct mlx4_priv {
struct mlx4_dev dev;
  


pgpUxugdSd7e0.pgp
Description: PGP signature

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

2012-07-08 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/hw/ocrdma/ocrdma_main.c between commit 6ab6827ee999
("RDMA/ocrdma: Fixed GID table for vlan and events") from Linus' tree and
commit 898648347205 ("IB: Use IS_ENABLED(CONFIG_IPV6)") from the
infiniband tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_main.c
index b050e62,93c9462..000
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@@ -202,8 -197,7 +202,7 @@@ static int ocrdma_build_sgid_tbl(struc
return 0;
  }
  
- #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) || \
- defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 -#if IS_ENABLED(CONFIG_IPV6)
++#if IS_ENABLED(CONFIG_IPV6) || IS_ENABLED(CONFIG_VLAN_8021Q)
  
  static int ocrdma_inet6addr_event(struct notifier_block *notifier,
  unsigned long event, void *ptr)


pgpRy2b4if145.pgp
Description: PGP signature

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

2012-07-08 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the infiniband tree got a conflict in
drivers/infiniband/hw/ocrdma/ocrdma_main.c between commit 6ab6827ee999
(RDMA/ocrdma: Fixed GID table for vlan and events) from Linus' tree and
commit 898648347205 (IB: Use IS_ENABLED(CONFIG_IPV6)) from the
infiniband tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/infiniband/hw/ocrdma/ocrdma_main.c
index b050e62,93c9462..000
--- a/drivers/infiniband/hw/ocrdma/ocrdma_main.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_main.c
@@@ -202,8 -197,7 +202,7 @@@ static int ocrdma_build_sgid_tbl(struc
return 0;
  }
  
- #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) || \
- defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 -#if IS_ENABLED(CONFIG_IPV6)
++#if IS_ENABLED(CONFIG_IPV6) || IS_ENABLED(CONFIG_VLAN_8021Q)
  
  static int ocrdma_inet6addr_event(struct notifier_block *notifier,
  unsigned long event, void *ptr)


pgpRy2b4if145.pgp
Description: PGP signature