From: Doug Ledford <dledford@redhat.com>
Date: Thu, 29 Oct 2015 02:23:34 +0000 (-0400)
Subject: Merge branch 'wr-cleanup' into k.o/for-4.4
X-Git-Tag: v4.4-rc1~78^2~29
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=63e8790d39a2d7c9a0ebeab987a6033d184bc6ba;p=linux.git

Merge branch 'wr-cleanup' into k.o/for-4.4
---

63e8790d39a2d7c9a0ebeab987a6033d184bc6ba
diff --cc drivers/infiniband/hw/mlx4/mad.c
index 67c7120f0d52,5f2de2ed5598..870e56b6b25f
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@@ -1183,10 -1173,11 +1184,11 @@@ static int is_proxy_qp0(struct mlx4_ib_
  int mlx4_ib_send_to_wire(struct mlx4_ib_dev *dev, int slave, u8 port,
  			 enum ib_qp_type dest_qpt, u16 pkey_index,
  			 u32 remote_qpn, u32 qkey, struct ib_ah_attr *attr,
 -			 u8 *s_mac, struct ib_mad *mad)
 +			 u8 *s_mac, u16 vlan_id, struct ib_mad *mad)
  {
  	struct ib_sge list;
- 	struct ib_send_wr wr, *bad_wr;
+ 	struct ib_ud_wr wr;
+ 	struct ib_send_wr *bad_wr;
  	struct mlx4_ib_demux_pv_ctx *sqp_ctx;
  	struct mlx4_ib_demux_pv_qp *sqp;
  	struct mlx4_mad_snd_buf *sqp_mad;
@@@ -1257,25 -1248,22 +1259,25 @@@
  	list.length = sizeof (struct mlx4_mad_snd_buf);
  	list.lkey = sqp_ctx->pd->local_dma_lkey;
  
- 	wr.wr.ud.ah = ah;
- 	wr.wr.ud.port_num = port;
- 	wr.wr.ud.pkey_index = wire_pkey_ix;
- 	wr.wr.ud.remote_qkey = qkey;
- 	wr.wr.ud.remote_qpn = remote_qpn;
- 	wr.next = NULL;
- 	wr.wr_id = ((u64) wire_tx_ix) | MLX4_TUN_SET_WRID_QPN(src_qpnum);
- 	wr.sg_list = &list;
- 	wr.num_sge = 1;
- 	wr.opcode = IB_WR_SEND;
- 	wr.send_flags = IB_SEND_SIGNALED;
+ 	wr.ah = ah;
+ 	wr.port_num = port;
+ 	wr.pkey_index = wire_pkey_ix;
+ 	wr.remote_qkey = qkey;
+ 	wr.remote_qpn = remote_qpn;
+ 	wr.wr.next = NULL;
+ 	wr.wr.wr_id = ((u64) wire_tx_ix) | MLX4_TUN_SET_WRID_QPN(src_qpnum);
+ 	wr.wr.sg_list = &list;
+ 	wr.wr.num_sge = 1;
+ 	wr.wr.opcode = IB_WR_SEND;
+ 	wr.wr.send_flags = IB_SEND_SIGNALED;
  	if (s_mac)
  		memcpy(to_mah(ah)->av.eth.s_mac, s_mac, 6);
 +	if (vlan_id < 0x1000)
 +		vlan_id |= (attr->sl & 7) << 13;
 +	to_mah(ah)->av.eth.vlan = cpu_to_be16(vlan_id);
  
  
- 	ret = ib_post_send(send_qp, &wr, &bad_wr);
+ 	ret = ib_post_send(send_qp, &wr.wr, &bad_wr);
  out:
  	if (ret)
  		ib_destroy_ah(ah);