1 files changed, 29 insertions, 29 deletions

diff --git a/include/linux/rds.h b/include/linux/rds.h
index f371f885a352..3576b31b6b7b 100644
--- a/include/linux/rds.h
+++ b/include/linux/rds.h
@@ -93,8 +93,8 @@
 #define RDS_INFO_LAST                   10010
 
 struct rds_info_counter {
-        u_int8_t        name[32];
-        u_int64_t       value;
+        uint8_t name[32];
+        uint64_t        value;
 } __attribute__((packed));
 
 #define RDS_INFO_CONNECTION_FLAG_SENDING        0x01
@@ -104,18 +104,18 @@ struct rds_info_counter {
 #define TRANSNAMSIZ     16
 
 struct rds_info_connection {
-        u_int64_t       next_tx_seq;
-        u_int64_t       next_rx_seq;
+        uint64_t        next_tx_seq;
+        uint64_t        next_rx_seq;
         __be32          laddr;
         __be32          faddr;
-        u_int8_t        transport[TRANSNAMSIZ];         /* null term ascii */
-        u_int8_t        flags;
+        uint8_t transport[TRANSNAMSIZ];         /* null term ascii */
+        uint8_t flags;
 } __attribute__((packed));
 
 struct rds_info_flow {
         __be32          laddr;
         __be32          faddr;
-        u_int32_t       bytes;
+        uint32_t        bytes;
         __be16          lport;
         __be16          fport;
 } __attribute__((packed));
@@ -124,23 +124,23 @@ struct rds_info_flow {
 #define RDS_INFO_MESSAGE_FLAG_FAST_ACK          0x02
 
 struct rds_info_message {
-        u_int64_t       seq;
-        u_int32_t       len;
+        uint64_t        seq;
+        uint32_t        len;
         __be32          laddr;
         __be32          faddr;
         __be16          lport;
         __be16          fport;
-        u_int8_t        flags;
+        uint8_t flags;
 } __attribute__((packed));
 
 struct rds_info_socket {
-        u_int32_t       sndbuf;
+        uint32_t        sndbuf;
         __be32          bound_addr;
         __be32          connected_addr;
         __be16          bound_port;
         __be16          connected_port;
-        u_int32_t       rcvbuf;
-        u_int64_t       inum;
+        uint32_t        rcvbuf;
+        uint64_t        inum;
 } __attribute__((packed));
 
 struct rds_info_tcp_socket {
@@ -148,11 +148,11 @@ struct rds_info_tcp_socket {
         __be16          local_port;
         __be32          peer_addr;
         __be16          peer_port;
-        u_int64_t       hdr_rem;
-        u_int64_t       data_rem;
-        u_int32_t       last_sent_nxt;
-        u_int32_t       last_expected_una;
-        u_int32_t       last_seen_una;
+        uint64_t       hdr_rem;
+        uint64_t       data_rem;
+        uint32_t       last_sent_nxt;
+        uint32_t       last_expected_una;
+        uint32_t       last_seen_una;
 } __attribute__((packed));
 
 #define RDS_IB_GID_LEN  16
@@ -207,38 +207,38 @@ struct rds_info_rdma_connection {
  * (so that the application does not have to worry about
  * alignment).
  */
-typedef u_int64_t       rds_rdma_cookie_t;
+typedef uint64_t        rds_rdma_cookie_t;
 
 struct rds_iovec {
-        u_int64_t       addr;
-        u_int64_t       bytes;
+        uint64_t        addr;
+        uint64_t        bytes;
 };
 
 struct rds_get_mr_args {
         struct rds_iovec vec;
-        u_int64_t       cookie_addr;
+        uint64_t        cookie_addr;
         uint64_t        flags;
 };
 
 struct rds_get_mr_for_dest_args {
         struct sockaddr_storage dest_addr;
         struct rds_iovec        vec;
-        u_int64_t               cookie_addr;
+        uint64_t                cookie_addr;
         uint64_t                flags;
 };
 
 struct rds_free_mr_args {
         rds_rdma_cookie_t cookie;
-        u_int64_t       flags;
+        uint64_t        flags;
 };
 
 struct rds_rdma_args {
         rds_rdma_cookie_t cookie;
         struct rds_iovec remote_vec;
-        u_int64_t       local_vec_addr;
-        u_int64_t       nr_local;
-        u_int64_t       flags;
-        u_int64_t       user_token;
+        uint64_t        local_vec_addr;
+        uint64_t        nr_local;
+        uint64_t        flags;
+        uint64_t        user_token;
 };
 
 struct rds_atomic_args {
@@ -269,7 +269,7 @@ struct rds_atomic_args {
 };
 
 struct rds_rdma_notify {
-        u_int64_t       user_token;
+        uint64_t        user_token;
         int32_t         status;
 };