diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-06 14:55:33 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-06 14:55:33 -0800 |
commit | 0c7d3757116c59b3eedd9aa6dfd7ae0a1341f5c2 (patch) | |
tree | 61dbcee09d925a839b34df3b8149e26972dc5402 /drivers/infiniband/ulp/srp/ib_srp.h | |
parent | 2442d3109943bafbdfc4f0495e3d10eeedc8390c (diff) | |
parent | b45bfcc1ae084aa98c0350b8c33c8b57540b0acc (diff) | |
download | kernel_samsung_smdk4412-0c7d3757116c59b3eedd9aa6dfd7ae0a1341f5c2.zip kernel_samsung_smdk4412-0c7d3757116c59b3eedd9aa6dfd7ae0a1341f5c2.tar.gz kernel_samsung_smdk4412-0c7d3757116c59b3eedd9aa6dfd7ae0a1341f5c2.tar.bz2 |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IB/ehca: Remove obsolete prototypes
IB/ehca: Remove use of do_mmap()
RDMA/addr: Handle ethernet neighbour updates during route resolution
IB: Make sure struct ib_user_mad.data is aligned
IB/srp: Don't wait for response when QP is in error state.
IB: Return qp pointer as part of ib_wc
IB: Include <linux/kref.h> explicitly in <rdma/ib_verbs.h>
Diffstat (limited to 'drivers/infiniband/ulp/srp/ib_srp.h')
-rw-r--r-- | drivers/infiniband/ulp/srp/ib_srp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h index c217723..2f3319c 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.h +++ b/drivers/infiniband/ulp/srp/ib_srp.h @@ -158,6 +158,7 @@ struct srp_target_port { struct completion done; int status; enum srp_target_state state; + int qp_in_error; }; struct srp_iu { |