Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc

[pandora-kernel.git] / net / rxrpc / call.c

diff --git a/net/rxrpc/call.c b/net/rxrpc/call.c
index 86f7770..d07122b 100644 (file)
--- a/net/rxrpc/call.c
+++ b/net/rxrpc/call.c
@@ -1098,8 +1098,7 @@ static void rxrpc_call_receive_data_packet(struct rxrpc_call *call,
 
                call->app_ready_seq = pmsg->seq;
                call->app_ready_qty += pmsg->dsize;
-               list_del_init(&pmsg->link);
-               list_add_tail(&pmsg->link, &call->app_readyq);
+               list_move_tail(&pmsg->link, &call->app_readyq);
        }
 
        /* see if we've got the last packet yet */
@@ -1923,7 +1922,7 @@ int rxrpc_call_write_data(struct rxrpc_call *call,
                          size_t sioc,
                          struct kvec *siov,
                          u8 rxhdr_flags,
-                         unsigned int __nocast alloc_flags,
+                         gfp_t alloc_flags,
                          int dup_data,
                          size_t *size_sent)
 {