diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-19 02:53:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-19 02:53:57 -0400 |
| commit | 0702b30dd821ac8a4103ddbe545518713fdca9be (patch) | |
| tree | 8ce0c9f5e58c5ccb99870505eecd139986caa05e /drivers/infiniband/hw/nes/nes_verbs.h | |
| parent | 192d7a4667c6d11d1a174ec4cad9a3c5d5f9043c (diff) | |
| parent | a1e4ee22863d41a6fbb24310d7951836cb6dafe7 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/infiniband/hw/nes/nes_verbs.h')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_verbs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/hw/nes/nes_verbs.h b/drivers/infiniband/hw/nes/nes_verbs.h index 6c6b4da5184..ae0ca9bc83b 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.h +++ b/drivers/infiniband/hw/nes/nes_verbs.h | |||
| @@ -134,6 +134,7 @@ struct nes_qp { | |||
| 134 | struct ietf_mpa_frame *ietf_frame; | 134 | struct ietf_mpa_frame *ietf_frame; |
| 135 | dma_addr_t ietf_frame_pbase; | 135 | dma_addr_t ietf_frame_pbase; |
| 136 | wait_queue_head_t state_waitq; | 136 | wait_queue_head_t state_waitq; |
| 137 | struct ib_mr *lsmm_mr; | ||
| 137 | unsigned long socket; | 138 | unsigned long socket; |
| 138 | struct nes_hw_qp hwqp; | 139 | struct nes_hw_qp hwqp; |
| 139 | struct work_struct work; | 140 | struct work_struct work; |