diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-11 04:29:48 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-11 04:29:48 -0400 |
commit | 29d8699ebb1e8948a612306c69e6d9c4ef23342f (patch) | |
tree | f2378e8d2fbef7fc215a25acf2042b8965109e5e /include/rdma/ib_mad.h | |
parent | e9438250b635f7832e99a8c8d2e394dd1522ce65 (diff) | |
parent | 907a42617970a159361f17ef9a63f04d276995ab (diff) |
Merge branch 'master' of /usr/src/ntfs-2.6/
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. |