fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / rxrpc / call.c

diff --git a/net/rxrpc/call.c b/net/rxrpc/call.c
index dfb65d8..d07122b 100644 (file)
--- a/net/rxrpc/call.c
+++ b/net/rxrpc/call.c
@@ -26,10 +26,10 @@ __RXACCT_DECL(atomic_t rxrpc_message_count);
 LIST_HEAD(rxrpc_calls);
 DECLARE_RWSEM(rxrpc_calls_sem);
 
-unsigned rxrpc_call_rcv_timeout                = HZ/3;
-unsigned rxrpc_call_acks_timeout       = HZ/3;
-unsigned rxrpc_call_dfr_ack_timeout    = HZ/20;
-unsigned short rxrpc_call_max_resend   = HZ/10;
+unsigned rxrpc_call_rcv_timeout                        = HZ/3;
+static unsigned rxrpc_call_acks_timeout                = HZ/3;
+static unsigned rxrpc_call_dfr_ack_timeout     = HZ/20;
+static unsigned short rxrpc_call_max_resend    = HZ/10;
 
 const char *rxrpc_call_states[] = {
        "COMPLETE",
@@ -58,7 +58,7 @@ const char *rxrpc_pkts[] = {
        "?09", "?10", "?11", "?12", "?13", "?14", "?15"
 };
 
-const char *rxrpc_acks[] = {
+static const char *rxrpc_acks[] = {
        "---", "REQ", "DUP", "SEQ", "WIN", "MEM", "PNG", "PNR", "DLY", "IDL",
        "-?-"
 };
@@ -79,6 +79,9 @@ static int rxrpc_call_record_ACK(struct rxrpc_call *call,
                                 struct rxrpc_message *msg,
                                 rxrpc_seq_t seq,
                                 size_t count);
+
+static int rxrpc_call_flush(struct rxrpc_call *call);
+
 #define _state(call) \
        _debug("[[[ state %s ]]]", rxrpc_call_states[call->app_call_state]);
 
@@ -1095,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 */
@@ -1920,7 +1922,7 @@ int rxrpc_call_write_data(struct rxrpc_call *call,
                          size_t sioc,
                          struct kvec *siov,
                          u8 rxhdr_flags,
-                         int alloc_flags,
+                         gfp_t alloc_flags,
                          int dup_data,
                          size_t *size_sent)
 {
@@ -2079,7 +2081,7 @@ int rxrpc_call_write_data(struct rxrpc_call *call,
 /*
  * flush outstanding packets to the network
  */
-int rxrpc_call_flush(struct rxrpc_call *call)
+static int rxrpc_call_flush(struct rxrpc_call *call)
 {
        struct rxrpc_message *msg;
        int ret = 0;