diff options
| author | Greg Kroah-Hartman | 2017-10-09 09:11:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-10-09 09:11:09 +0200 |
| commit | 4fcae770f3027abefd952c5d511ac6299828865a (patch) | |
| tree | 6cf64399a20f989358831a8f9b2ac2bb19628f54 /drivers/infiniband/hw/qedr/qedr.h | |
| parent | usb: host: xhci-plat: Use of_device_get_match_data() helper (diff) | |
| parent | Linux 4.14-rc4 (diff) | |
| download | kernel-qcow2-linux-4fcae770f3027abefd952c5d511ac6299828865a.tar.gz kernel-qcow2-linux-4fcae770f3027abefd952c5d511ac6299828865a.tar.xz kernel-qcow2-linux-4fcae770f3027abefd952c5d511ac6299828865a.zip | |
Merge 4.14-rc4 into usb-next
This merges in the USB fixes that we need here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/infiniband/hw/qedr/qedr.h')
| -rw-r--r-- | drivers/infiniband/hw/qedr/qedr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qedr/qedr.h b/drivers/infiniband/hw/qedr/qedr.h index b2bb42e2805d..254083b524bd 100644 --- a/drivers/infiniband/hw/qedr/qedr.h +++ b/drivers/infiniband/hw/qedr/qedr.h @@ -387,7 +387,7 @@ struct qedr_qp { u8 wqe_size; u8 smac[ETH_ALEN]; - u16 vlan_id; + u16 vlan; int rc; } *rqe_wr_id; |