diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 01:48:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-11 01:48:37 -0400 |
| commit | 1a04392bd6439876b1552793389cbb5be356ea54 (patch) | |
| tree | 12af7b77e3b0848127f2d2871778c9c1f315578a /include/rxrpc | |
| parent | 68399bb5080c1d96f2110b0a040b39d3ccd7a18a (diff) | |
| parent | 3c92c2ba33cd7d666c5f83cc32aa590e794e91b0 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/rxrpc')
| -rw-r--r-- | include/rxrpc/call.h | 2 | ||||
| -rw-r--r-- | include/rxrpc/message.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/rxrpc/call.h b/include/rxrpc/call.h index 8118731e7d96..b86f83743510 100644 --- a/include/rxrpc/call.h +++ b/include/rxrpc/call.h | |||
| @@ -203,7 +203,7 @@ extern int rxrpc_call_write_data(struct rxrpc_call *call, | |||
| 203 | size_t sioc, | 203 | size_t sioc, |
| 204 | struct kvec *siov, | 204 | struct kvec *siov, |
| 205 | uint8_t rxhdr_flags, | 205 | uint8_t rxhdr_flags, |
| 206 | unsigned int __nocast alloc_flags, | 206 | gfp_t alloc_flags, |
| 207 | int dup_data, | 207 | int dup_data, |
| 208 | size_t *size_sent); | 208 | size_t *size_sent); |
| 209 | 209 | ||
diff --git a/include/rxrpc/message.h b/include/rxrpc/message.h index 983d9f9eee1a..b318f273d4f2 100644 --- a/include/rxrpc/message.h +++ b/include/rxrpc/message.h | |||
| @@ -63,7 +63,7 @@ extern int rxrpc_conn_newmsg(struct rxrpc_connection *conn, | |||
| 63 | uint8_t type, | 63 | uint8_t type, |
| 64 | int count, | 64 | int count, |
| 65 | struct kvec *diov, | 65 | struct kvec *diov, |
| 66 | unsigned int __nocast alloc_flags, | 66 | gfp_t alloc_flags, |
| 67 | struct rxrpc_message **_msg); | 67 | struct rxrpc_message **_msg); |
| 68 | 68 | ||
| 69 | extern int rxrpc_conn_sendmsg(struct rxrpc_connection *conn, struct rxrpc_message *msg); | 69 | extern int rxrpc_conn_sendmsg(struct rxrpc_connection *conn, struct rxrpc_message *msg); |