diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
| commit | 90890687859ea658759e653c4e70ed7e9e1a6217 (patch) | |
| tree | 9065b30bb189e16ef99b8b5a0d444558f8dc579f /include/rdma/ib_mad.h | |
| parent | 2995bfb7855aabd493f840af361f3dd7d221caea (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/rdma/ib_mad.h')
| -rw-r--r-- | include/rdma/ib_mad.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rdma/ib_mad.h b/include/rdma/ib_mad.h index 0e293fe733b0..4172e6841e3d 100644 --- a/include/rdma/ib_mad.h +++ b/include/rdma/ib_mad.h | |||
| @@ -596,7 +596,7 @@ struct ib_mad_send_buf * ib_create_send_mad(struct ib_mad_agent *mad_agent, | |||
| 596 | u32 remote_qpn, u16 pkey_index, | 596 | u32 remote_qpn, u16 pkey_index, |
| 597 | struct ib_ah *ah, int rmpp_active, | 597 | struct ib_ah *ah, int rmpp_active, |
| 598 | int hdr_len, int data_len, | 598 | int hdr_len, int data_len, |
| 599 | unsigned int __nocast gfp_mask); | 599 | gfp_t gfp_mask); |
| 600 | 600 | ||
| 601 | /** | 601 | /** |
| 602 | * ib_free_send_mad - Returns data buffers used to send a MAD. | 602 | * ib_free_send_mad - Returns data buffers used to send a MAD. |