diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-20 06:04:11 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-20 06:04:11 +0300 |
| commit | dc847d5b4aa852c41b56c21bdc759fee13cc8f68 (patch) | |
| tree | 7071b8f5b8a2594d41ec82aab3d50d117c8c7fe3 /include/rdma | |
| parent | 2673ee565f10e0f2fdcf61f7a715e6b4ac2497dc (diff) | |
| parent | e116a64fab650aed3d7b9b4db0b59c07f361bc9f (diff) | |
| download | linux-dc847d5b4aa852c41b56c21bdc759fee13cc8f68.tar.xz | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
Pull rdma fixes from Doug Ledford:
"The new hfi1 driver in staging/rdma has had a number of fixup patches
since being added to the tree. This is the first batch of those fixes"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
IB/hfi: Properly set permissions for user device files
IB/hfi1: mask vs shift confusion
IB/hfi1: clean up some defines
IB/hfi1: info leak in get_ctxt_info()
IB/hfi1: fix a locking bug
IB/hfi1: checking for NULL instead of IS_ERR
IB/hfi1: fix sdma_descq_cnt parameter parsing
IB/hfi1: fix copy_to/from_user() error handling
IB/hfi1: fix pstateinfo from returning improperly byteswapped value
Diffstat (limited to 'include/rdma')
| -rw-r--r-- | include/rdma/opa_port_info.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/rdma/opa_port_info.h b/include/rdma/opa_port_info.h index 391dae1931c0..a0fa975cd1c1 100644 --- a/include/rdma/opa_port_info.h +++ b/include/rdma/opa_port_info.h @@ -294,8 +294,8 @@ struct opa_port_states { struct opa_port_state_info { struct opa_port_states port_states; - u16 link_width_downgrade_tx_active; - u16 link_width_downgrade_rx_active; + __be16 link_width_downgrade_tx_active; + __be16 link_width_downgrade_rx_active; }; struct opa_port_info { |