---

yaml
---
r: 17071
b: refs/heads/master
c: 0f8e8f9
h: refs/heads/master
i:
  17069: c6828fd
  17067: d720675
  17063: 3128a56
  17055: 4e606d0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ceb74557c71465cf8f6fda050aac00e53f9ad3d
+refs/heads/master: 0f8e8f9607d77ffc1f9820446dfcf781e96fdfd4

trunk/drivers/infiniband/hw/mthca/mthca_cq.c

@@ -128,12 +128,12 @@ struct mthca_err_cqe {
 	__be32 my_qpn;
 	u32    reserved1[3];
 	u8     syndrome;
-	u8     reserved2;
+	u8     vendor_err;
 	__be16 db_cnt;
-	u32    reserved3;
+	u32    reserved2;
 	__be32 wqe;
 	u8     opcode;
-	u8     reserved4[2];
+	u8     reserved3[2];
 	u8     owner;
 };
 
@@ -342,8 +342,8 @@ static int handle_error_cqe(struct mthca_dev *dev, struct mthca_cq *cq,
 	}
 
 	/*
-	 * For completions in error, only work request ID, status (and
-	 * freed resource count for RD) have to be set.
+	 * For completions in error, only work request ID, status, vendor error
+	 * (and freed resource count for RD) have to be set.
 	 */
 	switch (cqe->syndrome) {
 	case SYNDROME_LOCAL_LENGTH_ERR:
@@ -405,6 +405,8 @@ static int handle_error_cqe(struct mthca_dev *dev, struct mthca_cq *cq,
 		break;
 	}
 
+	entry->vendor_err = cqe->vendor_err;
+
 	/*
 	 * Mem-free HCAs always generate one CQE per WQE, even in the
 	 * error case, so we don't have to check the doorbell count, etc.