diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 16:50:52 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-18 16:50:52 -0400 |
| commit | cff6bf970965c98c62007fc8a36527fd147fe233 (patch) | |
| tree | 2791f2208b54ade86625af416ff5342f11282f0c /net/rxrpc/connection.c | |
| parent | 6cd7525a00f3b926e8bd2e402954ed3e09a8e924 (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
Merge /home/trondmy/scm/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/rxrpc/connection.c')
| -rw-r--r-- | net/rxrpc/connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/connection.c b/net/rxrpc/connection.c index 61463c74f8cc..2ba14a75dbbe 100644 --- a/net/rxrpc/connection.c +++ b/net/rxrpc/connection.c | |||
| @@ -522,7 +522,7 @@ int rxrpc_conn_newmsg(struct rxrpc_connection *conn, | |||
| 522 | uint8_t type, | 522 | uint8_t type, |
| 523 | int dcount, | 523 | int dcount, |
| 524 | struct kvec diov[], | 524 | struct kvec diov[], |
| 525 | int alloc_flags, | 525 | gfp_t alloc_flags, |
| 526 | struct rxrpc_message **_msg) | 526 | struct rxrpc_message **_msg) |
| 527 | { | 527 | { |
| 528 | struct rxrpc_message *msg; | 528 | struct rxrpc_message *msg; |