Subject: afs/net/rxrpc transport.c,1.5,1.6 peer.c,1.6,1.7 main.c,1.5,1.6 connection.c,1.5,1.6 call.c,1.7,1.8

From: [email-masked]
Date: Wed, 13 Aug 2003 11:05:30 +0100

Update of /home/cvs/afs/net/rxrpc
In directory phoenix.infradead.org:/tmp/cvs-serv701/net/rxrpc

Modified Files:
	transport.c peer.c main.c connection.c call.c 
Log Message:
changed u_intXX_t to uintXX_t

Index: transport.c
===================================================================
RCS file: /home/cvs/afs/net/rxrpc/transport.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- transport.c	12 Aug 2003 17:04:02 -0000	1.5
+++ transport.c	13 Aug 2003 10:05:27 -0000	1.6
@@ -596,7 +596,7 @@
 	struct msghdr msghdr;
 	struct iovec iov[2];
 	mm_segment_t oldfs;
-	u_int32_t _error;
+	uint32_t _error;
 	int len, ret;
 
 	_enter("%p,%p,%d", trans, msg, error);
@@ -668,7 +668,7 @@
 	struct errormsg emsg;
 	struct msghdr msg;
 	mm_segment_t oldfs;
-	u_int16_t port;
+	uint16_t port;
 	int local, err;
 
 	_enter("%p", trans);

Index: peer.c
===================================================================
RCS file: /home/cvs/afs/net/rxrpc/peer.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- peer.c	12 Aug 2003 17:04:02 -0000	1.6
+++ peer.c	13 Aug 2003 10:05:27 -0000	1.7
@@ -48,7 +48,7 @@
 /*
  * create a peer record
  */
-static int __rxrpc_create_peer(struct rxrpc_transport *trans, u_int32_t addr,
+static int __rxrpc_create_peer(struct rxrpc_transport *trans, uint32_t addr,
 			       struct rxrpc_peer **_peer)
 {
 	struct rxrpc_peer *peer;
@@ -94,7 +94,7 @@
  * - returns (if successful) with peer record usage incremented
  * - resurrects it from the graveyard if found there
  */
-int rxrpc_peer_lookup(struct rxrpc_transport *trans, u_int32_t addr,
+int rxrpc_peer_lookup(struct rxrpc_transport *trans, uint32_t addr,
 		      struct rxrpc_peer **_peer)
 {
 	struct rxrpc_peer *peer, *candidate = NULL;

Index: main.c
===================================================================
RCS file: /home/cvs/afs/net/rxrpc/main.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- main.c	12 Aug 2003 17:04:02 -0000	1.5
+++ main.c	13 Aug 2003 10:05:27 -0000	1.6
@@ -32,7 +32,7 @@
 MODULE_AUTHOR("Red Hat, Inc.");
 MODULE_LICENSE("GPL");
 
-u_int32_t rxrpc_epoch;
+uint32_t rxrpc_epoch;
 
 /*****************************************************************************/
 /*

Index: connection.c
===================================================================
RCS file: /home/cvs/afs/net/rxrpc/connection.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- connection.c	12 Aug 2003 17:04:02 -0000	1.5
+++ connection.c	13 Aug 2003 10:05:27 -0000	1.6
@@ -87,9 +87,9 @@
  * create a new connection record for outgoing connections
  */
 int rxrpc_create_connection(struct rxrpc_transport *trans,
-			    u_int16_t port,
-			    u_int32_t addr,
-			    u_int16_t service_id,
+			    uint16_t port,
+			    uint32_t addr,
+			    uint16_t service_id,
 			    void *security,
 			    struct rxrpc_connection **_conn)
 {
@@ -481,7 +481,7 @@
  */
 int rxrpc_conn_newmsg(struct rxrpc_connection *conn,
 		      struct rxrpc_call *call,
-		      u_int8_t type,
+		      uint8_t type,
 		      int dcount,
 		      struct iovec diov[],
 		      int alloc_flags,

Index: call.c
===================================================================
RCS file: /home/cvs/afs/net/rxrpc/call.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- call.c	12 Aug 2003 17:04:02 -0000	1.7
+++ call.c	13 Aug 2003 10:05:27 -0000	1.8
@@ -337,7 +337,7 @@
 
 	call->pkt_rcv_count = 1;
 	call->app_call_state = RXRPC_CSTATE_SRVR_RCV_OPID;
-	call->app_mark = sizeof(u_int32_t);
+	call->app_mark = sizeof(uint32_t);
 
 	_state(call);
 
@@ -718,7 +718,7 @@
 	if (special_ACK) {
 		struct rxrpc_ackpacket ack;
 		struct iovec diov[2];
-		u_int8_t acks[1] = { RXRPC_ACK_TYPE_ACK };
+		uint8_t acks[1] = { RXRPC_ACK_TYPE_ACK };
 
 		/* fill out the appropriate form */
 		ack.bufferSpace	= htons(RXRPC_CALL_ACK_WINDOW_SIZE);
@@ -928,7 +928,7 @@
 {
 	struct rxrpc_message *msg;
 	struct list_head *_p;
-	u_int32_t data32;
+	uint32_t data32;
 
 	_enter("%p", call);