fixed to build xen rpm properly

[linux-2.6.git] / include / rxrpc / call.h

diff --git a/include/rxrpc/call.h b/include/rxrpc/call.h
index 2620d19..b86f837 100644 (file)
--- a/include/rxrpc/call.h
+++ b/include/rxrpc/call.h
@@ -20,9 +20,6 @@
 #define RXRPC_CALL_ACK_WINDOW_SIZE     16
 
 extern unsigned rxrpc_call_rcv_timeout;                /* receive activity timeout (secs) */
-extern unsigned rxrpc_call_acks_timeout;       /* pending ACK (retransmit) timeout (secs) */
-extern unsigned rxrpc_call_dfr_ack_timeout;    /* deferred ACK timeout (secs) */
-extern unsigned short rxrpc_call_max_resend;           /* maximum consecutive resend count */
 
 /* application call state
  * - only state 0 and ffff are reserved, the state is set to 1 after an opid is received
@@ -67,8 +64,8 @@ struct rxrpc_call
        wait_queue_head_t       waitq;          /* wait queue for events to happen */
        struct list_head        link;           /* general internal list link */
        struct list_head        call_link;      /* master call list link */
-       uint32_t                chan_ix;        /* connection channel index (net order) */
-       uint32_t                call_id;        /* call ID on connection (net order) */
+       __be32                  chan_ix;        /* connection channel index  */
+       __be32                  call_id;        /* call ID on connection  */
        unsigned long           cjif;           /* jiffies at call creation */
        unsigned long           flags;          /* control flags */
 #define RXRPC_CALL_ACKS_TIMO   0x00000001      /* ACKS timeout reached */
@@ -97,7 +94,7 @@ struct rxrpc_call
        rxrpc_seq_t             ackr_win_bot;   /* bottom of ACK window */
        rxrpc_seq_t             ackr_win_top;   /* top of ACK window */
        rxrpc_seq_t             ackr_high_seq;  /* highest seqno yet received */
-       rxrpc_seq_t             ackr_prev_seq;  /* previous seqno received */
+       rxrpc_seq_net_t         ackr_prev_seq;  /* previous seqno received */
        unsigned                ackr_pend_cnt;  /* number of pending ACKs */
        struct timer_list       ackr_dfr_timo;  /* timeout on deferred ACK */
        char                    ackr_dfr_perm;  /* request for deferred ACKs permitted */
@@ -206,12 +203,10 @@ extern int rxrpc_call_write_data(struct rxrpc_call *call,
                                 size_t sioc,
                                 struct kvec *siov,
                                 uint8_t rxhdr_flags,
-                                int alloc_flags,
+                                gfp_t alloc_flags,
                                 int dup_data,
                                 size_t *size_sent);
 
-extern int rxrpc_call_flush(struct rxrpc_call *call);
-
 extern void rxrpc_call_handle_error(struct rxrpc_call *conn, int local, int errno);
 
 #endif /* _LINUX_RXRPC_CALL_H */