[openib-general] [PATCH] [TRIVIAL] In struct ib_wc, member name is src_qp rather than qp

[Hal Rosenstock]

In struct ib_wc, member name is src_qp rather than qp (to be consistent
with Sean's ib_verbs.h version) in Roland's branch

Index: core/mad_ib.c
===================================================================
--- core/mad_ib.c	(revision 649)
+++ core/mad_ib.c	(working copy)
@@ -228,7 +228,7 @@
 		mad->pkey_index = entry->pkey_index;
 		mad->slid       = entry->slid;
 		mad->dlid       = entry->dlid_path_bits;
-		mad->sqpn       = entry->qp;
+		mad->sqpn       = entry->src_qp;
 		mad->dqpn       = wrid.field.qpn;
 
 		if (entry->grh_flag) {
Index: hw/mthca/mthca_cq.c
===================================================================
--- hw/mthca/mthca_cq.c	(revision 649)
+++ hw/mthca/mthca_cq.c	(working copy)
@@ -476,7 +476,7 @@
 		}
 		entry->slid 	   = be16_to_cpu(cqe->rlid);
 		entry->sl   	   = be16_to_cpu(cqe->sl_g_mlpath) >> 12;
-		entry->qp 	   = be32_to_cpu(cqe->rqpn) & 0xffffff;
+		entry->src_qp 	   = be32_to_cpu(cqe->rqpn) & 0xffffff;
 		entry->dlid_path_bits = be16_to_cpu(cqe->sl_g_mlpath) & 0x7f;
 		entry->pkey_index  = be32_to_cpu(cqe->imm_etype_pkey_eec) >> 16;
 		entry->grh_flag    = !!(be16_to_cpu(cqe->sl_g_mlpath) & 0x80);
Index: include/ib_verbs.h
===================================================================
--- include/ib_verbs.h	(revision 649)
+++ include/ib_verbs.h	(working copy)
@@ -111,7 +111,7 @@
 	u32			vendor_err;
 	u32			byte_len;
 	u32			imm_data;
-	u32			qp;
+	u32			src_qp;
 	int			grh_flag:1;
 	int			imm_data_valid:1;
 	u16			pkey_index;
Index: ulp/ipoib/ipoib_ib.c
===================================================================
--- ulp/ipoib/ipoib_ib.c	(revision 649)
+++ ulp/ipoib/ipoib_ib.c	(working copy)
@@ -153,7 +153,7 @@
 			skb_pull(skb, TS_IB_GRH_BYTES);
 
 			if (entry->slid != priv->local_lid ||
-			    entry->qp != priv->local_qpn) {
+			    entry->src_qp != priv->local_qpn) {
 				struct ethhdr *header;
 
 				skb->protocol = *(uint16_t *)skb->data;