afs/include/rxrpc types.h,1.2,1.3 rxrpc.h,1.2,1.3 packet.h,1.2,1.3
message.h,1.2,1.3 connection.h,1.2,1.3 call.h,1.4,1.5
dwh at infradead.org
dwh at infradead.org
Wed Aug 13 12:05:30 BST 2003
- Previous message: 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
- Next message: afs/include/linux cachefs.h,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/afs/include/rxrpc
In directory phoenix.infradead.org:/tmp/cvs-serv701/include/rxrpc
Modified Files:
types.h rxrpc.h packet.h message.h connection.h call.h
Log Message:
changed u_intXX_t to uintXX_t
Index: types.h
===================================================================
RCS file: /home/cvs/afs/include/rxrpc/types.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- types.h 12 Aug 2003 17:04:03 -0000 1.2
+++ types.h 13 Aug 2003 10:05:27 -0000 1.3
@@ -19,8 +19,8 @@
#include <linux/spinlock.h>
#include <asm/atomic.h>
-typedef u_int32_t rxrpc_seq_t; /* Rx message sequence number */
-typedef u_int32_t rxrpc_serial_t; /* Rx message serial number */
+typedef uint32_t rxrpc_seq_t; /* Rx message sequence number */
+typedef uint32_t rxrpc_serial_t; /* Rx message serial number */
struct rxrpc_call;
struct rxrpc_connection;
Index: rxrpc.h
===================================================================
RCS file: /home/cvs/afs/include/rxrpc/rxrpc.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rxrpc.h 12 Aug 2003 17:04:03 -0000 1.2
+++ rxrpc.h 13 Aug 2003 10:05:27 -0000 1.3
@@ -14,7 +14,7 @@
#ifdef __KERNEL__
-extern u_int32_t rxrpc_epoch;
+extern uint32_t rxrpc_epoch;
extern int rxrpc_ktrace;
extern int rxrpc_kdebug;
Index: packet.h
===================================================================
RCS file: /home/cvs/afs/include/rxrpc/packet.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- packet.h 12 Aug 2003 17:04:03 -0000 1.2
+++ packet.h 13 Aug 2003 10:05:27 -0000 1.3
@@ -27,21 +27,21 @@
*/
struct rxrpc_header
{
- u_int32_t epoch; /* client boot timestamp */
+ uint32_t epoch; /* client boot timestamp */
- u_int32_t cid; /* connection and channel ID */
+ uint32_t cid; /* connection and channel ID */
#define RXRPC_MAXCALLS 4 /* max active calls per conn */
#define RXRPC_CHANNELMASK (RXRPC_MAXCALLS-1) /* mask for channel ID */
#define RXRPC_CIDMASK (~RXRPC_CHANNELMASK) /* mask for connection ID */
#define RXRPC_CIDSHIFT 2 /* shift for connection ID */
- u_int32_t callNumber; /* call ID (0 for connection-level packets) */
+ uint32_t callNumber; /* call ID (0 for connection-level packets) */
#define RXRPC_PROCESS_MAXCALLS (1<<2) /* maximum number of active calls per conn (power of 2) */
- u_int32_t seq; /* sequence number of pkt in call stream */
- u_int32_t serial; /* serial number of pkt sent to network */
+ uint32_t seq; /* sequence number of pkt in call stream */
+ uint32_t serial; /* serial number of pkt sent to network */
- u_int8_t type; /* packet type */
+ uint8_t type; /* packet type */
#define RXRPC_PACKET_TYPE_DATA 1 /* data */
#define RXRPC_PACKET_TYPE_ACK 2 /* ACK */
#define RXRPC_PACKET_TYPE_BUSY 3 /* call reject */
@@ -52,7 +52,7 @@
#define RXRPC_PACKET_TYPE_DEBUG 8 /* debug info request */
#define RXRPC_N_PACKET_TYPES 9 /* number of packet types (incl type 0) */
- u_int8_t flags; /* packet flags */
+ uint8_t flags; /* packet flags */
#define RXRPC_CLIENT_INITIATED 0x01 /* signifies a packet generated by a client */
#define RXRPC_REQUEST_ACK 0x02 /* request an unconditional ACK of this packet */
#define RXRPC_LAST_PACKET 0x04 /* the last packet from this side for this call */
@@ -60,10 +60,10 @@
#define RXRPC_JUMBO_PACKET 0x20 /* [DATA] this is a jumbo packet */
#define RXRPC_SLOW_START_OK 0x20 /* [ACK] slow start supported */
- u_int8_t userStatus; /* app-layer defined status */
- u_int8_t securityIndex; /* security protocol ID */
- u_int16_t _rsvd; /* reserved (used by kerberos security as cksum) */
- u_int16_t serviceId; /* service ID */
+ uint8_t userStatus; /* app-layer defined status */
+ uint8_t securityIndex; /* security protocol ID */
+ uint16_t _rsvd; /* reserved (used by kerberos security as cksum) */
+ uint16_t serviceId; /* service ID */
} __attribute__((packed));
@@ -83,9 +83,9 @@
*/
struct rxrpc_jumbo_header
{
- u_int8_t flags; /* packet flags (as per rxrpc_header) */
- u_int8_t pad;
- u_int16_t _rsvd; /* reserved (used by kerberos security as cksum) */
+ uint8_t flags; /* packet flags (as per rxrpc_header) */
+ uint8_t pad;
+ uint16_t _rsvd; /* reserved (used by kerberos security as cksum) */
};
#define RXRPC_JUMBO_DATALEN 1412 /* non-terminal jumbo packet data length */
@@ -97,14 +97,14 @@
*/
struct rxrpc_ackpacket
{
- u_int16_t bufferSpace; /* number of packet buffers available */
- u_int16_t maxSkew; /* diff between serno being ACK'd and highest serial no
+ uint16_t bufferSpace; /* number of packet buffers available */
+ uint16_t maxSkew; /* diff between serno being ACK'd and highest serial no
* received */
- u_int32_t firstPacket; /* sequence no of first ACK'd packet in attached list */
- u_int32_t previousPacket; /* sequence no of previous packet received */
- u_int32_t serial; /* serial no of packet that prompted this ACK */
+ uint32_t firstPacket; /* sequence no of first ACK'd packet in attached list */
+ uint32_t previousPacket; /* sequence no of previous packet received */
+ uint32_t serial; /* serial no of packet that prompted this ACK */
- u_int8_t reason; /* reason for ACK */
+ uint8_t reason; /* reason for ACK */
#define RXRPC_ACK_REQUESTED 1 /* ACK was requested on packet */
#define RXRPC_ACK_DUPLICATE 2 /* duplicate packet received */
#define RXRPC_ACK_OUT_OF_SEQUENCE 3 /* out of sequence packet received */
@@ -115,10 +115,10 @@
#define RXRPC_ACK_DELAY 8 /* nothing happened since received packet */
#define RXRPC_ACK_IDLE 9 /* ACK due to fully received ACK window */
- u_int8_t nAcks; /* number of ACKs */
+ uint8_t nAcks; /* number of ACKs */
#define RXRPC_MAXACKS 255
- u_int8_t acks[0]; /* list of ACK/NAKs */
+ uint8_t acks[0]; /* list of ACK/NAKs */
#define RXRPC_ACK_TYPE_NACK 0
#define RXRPC_ACK_TYPE_ACK 1
Index: message.h
===================================================================
RCS file: /home/cvs/afs/include/rxrpc/message.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- message.h 12 Aug 2003 17:04:03 -0000 1.2
+++ message.h 13 Aug 2003 10:05:27 -0000 1.3
@@ -61,7 +61,7 @@
extern int rxrpc_conn_newmsg(struct rxrpc_connection *conn,
struct rxrpc_call *call,
- u_int8_t type,
+ uint8_t type,
int count,
struct iovec diov[],
int alloc_flags,
Index: connection.h
===================================================================
RCS file: /home/cvs/afs/include/rxrpc/connection.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- connection.h 12 Aug 2003 17:04:03 -0000 1.2
+++ connection.h 13 Aug 2003 10:05:27 -0000 1.3
@@ -44,19 +44,19 @@
rxrpc_serial_t serial_counter; /* packet serial number counter */
/* the following should all be in net order */
- u_int32_t in_epoch; /* peer's epoch */
- u_int32_t out_epoch; /* my epoch */
- u_int32_t conn_id; /* connection ID, appropriately shifted */
- u_int16_t service_id; /* service ID */
- u_int8_t security_ix; /* security ID */
- u_int8_t in_clientflag; /* RXRPC_CLIENT_INITIATED if we are server */
- u_int8_t out_clientflag; /* RXRPC_CLIENT_INITIATED if we are client */
+ uint32_t in_epoch; /* peer's epoch */
+ uint32_t out_epoch; /* my epoch */
+ uint32_t conn_id; /* connection ID, appropriately shifted */
+ uint16_t service_id; /* service ID */
+ uint8_t security_ix; /* security ID */
+ uint8_t in_clientflag; /* RXRPC_CLIENT_INITIATED if we are server */
+ uint8_t out_clientflag; /* RXRPC_CLIENT_INITIATED if we are client */
};
extern int rxrpc_create_connection(struct rxrpc_transport *trans,
- u_int16_t port,
- u_int32_t addr,
- unsigned short service_id,
+ uint16_t port,
+ uint32_t addr,
+ uint16_t service_id,
void *security,
struct rxrpc_connection **_conn);
Index: call.h
===================================================================
RCS file: /home/cvs/afs/include/rxrpc/call.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- call.h 12 Aug 2003 17:04:03 -0000 1.4
+++ call.h 13 Aug 2003 10:05:27 -0000 1.5
@@ -67,8 +67,8 @@
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 */
- u_int32_t chan_ix; /* connection channel index (net order) */
- u_int32_t call_id; /* call ID on connection (net order) */
+ uint32_t chan_ix; /* connection channel index (net order) */
+ uint32_t call_id; /* call ID on connection (net order) */
unsigned long cjif; /* jiffies at call creation */
unsigned long flags; /* control flags */
#define RXRPC_CALL_ACKS_TIMO 0x00000001 /* ACKS timeout reached */
@@ -103,7 +103,7 @@
char ackr_dfr_perm; /* request for deferred ACKs permitted */
rxrpc_seq_t ackr_dfr_seq; /* seqno for deferred ACK */
struct rxrpc_ackpacket ackr; /* pending normal ACK packet */
- u_int8_t ackr_array[RXRPC_CALL_ACK_WINDOW_SIZE]; /* ACK records */
+ uint8_t ackr_array[RXRPC_CALL_ACK_WINDOW_SIZE]; /* ACK records */
/* presentation layer */
char app_last_rcv; /* T if received last packet from remote end */
@@ -131,14 +131,14 @@
struct list_head app_attn_link; /* application attention list linkage */
size_t app_mark; /* trigger callback when app_ready_qty>=app_mark */
char app_async_read; /* T if in async-read mode */
- u_int8_t *app_read_buf; /* application async read buffer (app_mark size) */
- u_int8_t *app_scr_alloc; /* application scratch allocation pointer */
+ uint8_t *app_read_buf; /* application async read buffer (app_mark size) */
+ uint8_t *app_scr_alloc; /* application scratch allocation pointer */
void *app_scr_ptr; /* application pointer into scratch buffer */
#define RXRPC_APP_MARK_EOF 0xFFFFFFFFU /* mark at end of input */
/* application scratch buffer */
- u_int8_t app_scratch[0] __attribute__((aligned(sizeof(long))));
+ uint8_t app_scratch[0] __attribute__((aligned(sizeof(long))));
};
#define RXRPC_CALL_SCRATCH_SIZE (PAGE_SIZE - sizeof(struct rxrpc_call))
@@ -206,7 +206,7 @@
extern int rxrpc_call_write_data(struct rxrpc_call *call,
size_t sioc,
struct iovec siov[],
- u_int8_t rxhdr_flags,
+ uint8_t rxhdr_flags,
int alloc_flags,
int dup_data,
size_t *size_sent);
- Previous message: 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
- Next message: afs/include/linux cachefs.h,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the linux-afs-cvs
mailing list