diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-22 04:28:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-22 04:28:56 -0400 |
| commit | 65c2ce70046c779974af8b5dfc25a0df489089b5 (patch) | |
| tree | b16f152eb62b71cf5a1edc51da865b357c989922 /drivers/infiniband/hw/cxgb4/iw_cxgb4.h | |
| parent | 842514849a616e9b61acad65771c7afe01e651f9 (diff) | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
Merge tag 'v3.15-rc6' into sched/core, to pick up the latest fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/infiniband/hw/cxgb4/iw_cxgb4.h')
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h index 7b8c5806a09d..7474b490760a 100644 --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h | |||
| @@ -435,6 +435,7 @@ struct c4iw_qp_attributes { | |||
| 435 | u8 ecode; | 435 | u8 ecode; |
| 436 | u16 sq_db_inc; | 436 | u16 sq_db_inc; |
| 437 | u16 rq_db_inc; | 437 | u16 rq_db_inc; |
| 438 | u8 send_term; | ||
| 438 | }; | 439 | }; |
| 439 | 440 | ||
| 440 | struct c4iw_qp { | 441 | struct c4iw_qp { |