diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 00:50:31 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-10-14 00:50:31 +0200 |
| commit | 69f658e399f3d9cb9c9680afb714ba23860d7ccb (patch) | |
| tree | 13fbc42f466cb10d319514e4ddec53def8c554f6 /drivers/infiniband/hw/qedr/qedr.h | |
| parent | PM / OPP: add missing of_node_put() for of_get_cpu_node() (diff) | |
| parent | PM / Domains: Add support to select performance-state of domains (diff) | |
| download | linux-69f658e399f3d9cb9c9680afb714ba23860d7ccb.tar.xz linux-69f658e399f3d9cb9c9680afb714ba23860d7ccb.zip | |
Merge branch 'pm-domains' into pm-opp
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; |