diff options
| author | Dennis Dalessandro <dennis.dalessandro@intel.com> | 2014-05-02 11:40:17 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-06 18:54:14 -0700 |
| commit | a533eba6682f1dc89bfa5dc6e16e18ea257dd4d0 (patch) | |
| tree | ab1071f1349b12747341a42d5099bc90883b520a /drivers/infiniband | |
| parent | 383be78f7c4f51a14b0d841b29c58ce9b60e21ec (diff) | |
| download | linux-3.10-a533eba6682f1dc89bfa5dc6e16e18ea257dd4d0.tar.gz linux-3.10-a533eba6682f1dc89bfa5dc6e16e18ea257dd4d0.tar.bz2 linux-3.10-a533eba6682f1dc89bfa5dc6e16e18ea257dd4d0.zip | |
IB/ipath: Translate legacy diagpkt into newer extended diagpkt
commit 7e6d3e5c70f13874fb06e6b67696ed90ce79bd48 upstream.
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.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_diag.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_diag.c b/drivers/infiniband/hw/ipath/ipath_diag.c index e2f9a51f4a3..45802e97332 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; |