From: Dennis Dalessandro <dennis.dalessandro@intel.com>
Date: Fri, 2 May 2014 15:40:17 +0000 (-0400)
Subject: IB/ipath: Translate legacy diagpkt into newer extended diagpkt
X-Git-Tag: firefly_0821_release~176^2~3797^2^11~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7e6d3e5c70f13874fb06e6b67696ed90ce79bd48;p=firefly-linux-kernel-4.4.55.git

IB/ipath: Translate legacy diagpkt into newer extended diagpkt

This patch addresses an issue where the legacy diagpacket is sent in
from the user, but the driver operates on only the extended
diagpkt. This patch specifically initializes the extended diagpkt
based on the legacy packet.

Cc: <stable@vger.kernel.org>
Reported-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
---

diff --git a/drivers/infiniband/hw/ipath/ipath_diag.c b/drivers/infiniband/hw/ipath/ipath_diag.c
index e2f9a51f4a38..45802e97332e 100644
--- a/drivers/infiniband/hw/ipath/ipath_diag.c
+++ b/drivers/infiniband/hw/ipath/ipath_diag.c
@@ -346,6 +346,10 @@ static ssize_t ipath_diagpkt_write(struct file *fp,
 			ret = -EFAULT;
 			goto bail;
 		}
+		dp.len = odp.len;
+		dp.unit = odp.unit;
+		dp.data = odp.data;
+		dp.pbc_wd = 0;
 	} else {
 		ret = -EINVAL;
 		goto bail;