diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-09 22:28:54 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-09 22:28:54 -0400 |
| commit | 30c083c3da00a052211f8f73740f2b46974454a1 (patch) | |
| tree | 871bbd357f4a1fd0c2e9fd86e29b6a4629bf0613 /include | |
| parent | 849bf20e732a71ca717a5c6f988bf3acc2a84a0c (diff) | |
| parent | 4c0283fc561d79a4f94ab48ec37282e15273d1f8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/core: Remove IB_DEVICE_SEND_W_INV capability flag
IB/umem: Avoid sign problems when demoting npages to integer
Diffstat (limited to 'include')
| -rw-r--r-- | include/rdma/ib_verbs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 911a661b7278..31d30b1852e8 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h | |||
| @@ -105,7 +105,6 @@ enum ib_device_cap_flags { | |||
| 105 | */ | 105 | */ |
| 106 | IB_DEVICE_UD_IP_CSUM = (1<<18), | 106 | IB_DEVICE_UD_IP_CSUM = (1<<18), |
| 107 | IB_DEVICE_UD_TSO = (1<<19), | 107 | IB_DEVICE_UD_TSO = (1<<19), |
| 108 | IB_DEVICE_SEND_W_INV = (1<<21), | ||
| 109 | }; | 108 | }; |
| 110 | 109 | ||
| 111 | enum ib_atomic_cap { | 110 | enum ib_atomic_cap { |