Commit dad8aff7 authored by David Howells's avatar David Howells Committed by David S. Miller

rxrpc: Replace all unsigned with unsigned int

Replace all "unsigned" types with "unsigned int" types.
Reported-by: default avatarDavid Miller <davem@davemloft.net>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 00e3d2ef
...@@ -81,7 +81,7 @@ static int rxrpc_validate_address(struct rxrpc_sock *rx, ...@@ -81,7 +81,7 @@ static int rxrpc_validate_address(struct rxrpc_sock *rx,
struct sockaddr_rxrpc *srx, struct sockaddr_rxrpc *srx,
int len) int len)
{ {
unsigned tail; unsigned int tail;
if (len < sizeof(struct sockaddr_rxrpc)) if (len < sizeof(struct sockaddr_rxrpc))
return -EINVAL; return -EINVAL;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
* How long to wait before scheduling ACK generation after seeing a * How long to wait before scheduling ACK generation after seeing a
* packet with RXRPC_REQUEST_ACK set (in jiffies). * packet with RXRPC_REQUEST_ACK set (in jiffies).
*/ */
unsigned rxrpc_requested_ack_delay = 1; unsigned int rxrpc_requested_ack_delay = 1;
/* /*
* How long to wait before scheduling an ACK with subtype DELAY (in jiffies). * How long to wait before scheduling an ACK with subtype DELAY (in jiffies).
...@@ -32,7 +32,7 @@ unsigned rxrpc_requested_ack_delay = 1; ...@@ -32,7 +32,7 @@ unsigned rxrpc_requested_ack_delay = 1;
* all consumed within this time we will send a DELAY ACK if an ACK was not * all consumed within this time we will send a DELAY ACK if an ACK was not
* requested to let the sender know it doesn't need to resend. * requested to let the sender know it doesn't need to resend.
*/ */
unsigned rxrpc_soft_ack_delay = 1 * HZ; unsigned int rxrpc_soft_ack_delay = 1 * HZ;
/* /*
* How long to wait before scheduling an ACK with subtype IDLE (in jiffies). * How long to wait before scheduling an ACK with subtype IDLE (in jiffies).
...@@ -41,7 +41,7 @@ unsigned rxrpc_soft_ack_delay = 1 * HZ; ...@@ -41,7 +41,7 @@ unsigned rxrpc_soft_ack_delay = 1 * HZ;
* further packets aren't immediately received to decide when to send an IDLE * further packets aren't immediately received to decide when to send an IDLE
* ACK let the other end know that it can free up its Tx buffer space. * ACK let the other end know that it can free up its Tx buffer space.
*/ */
unsigned rxrpc_idle_ack_delay = 0.5 * HZ; unsigned int rxrpc_idle_ack_delay = 0.5 * HZ;
/* /*
* Receive window size in packets. This indicates the maximum number of * Receive window size in packets. This indicates the maximum number of
...@@ -49,19 +49,19 @@ unsigned rxrpc_idle_ack_delay = 0.5 * HZ; ...@@ -49,19 +49,19 @@ unsigned rxrpc_idle_ack_delay = 0.5 * HZ;
* limit is hit, we should generate an EXCEEDS_WINDOW ACK and discard further * limit is hit, we should generate an EXCEEDS_WINDOW ACK and discard further
* packets. * packets.
*/ */
unsigned rxrpc_rx_window_size = 32; unsigned int rxrpc_rx_window_size = 32;
/* /*
* Maximum Rx MTU size. This indicates to the sender the size of jumbo packet * Maximum Rx MTU size. This indicates to the sender the size of jumbo packet
* made by gluing normal packets together that we're willing to handle. * made by gluing normal packets together that we're willing to handle.
*/ */
unsigned rxrpc_rx_mtu = 5692; unsigned int rxrpc_rx_mtu = 5692;
/* /*
* The maximum number of fragments in a received jumbo packet that we tell the * The maximum number of fragments in a received jumbo packet that we tell the
* sender that we're willing to handle. * sender that we're willing to handle.
*/ */
unsigned rxrpc_rx_jumbo_max = 4; unsigned int rxrpc_rx_jumbo_max = 4;
static const char *rxrpc_acks(u8 reason) static const char *rxrpc_acks(u8 reason)
{ {
......
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
/* /*
* Maximum lifetime of a call (in jiffies). * Maximum lifetime of a call (in jiffies).
*/ */
unsigned rxrpc_max_call_lifetime = 60 * HZ; unsigned int rxrpc_max_call_lifetime = 60 * HZ;
/* /*
* Time till dead call expires after last use (in jiffies). * Time till dead call expires after last use (in jiffies).
*/ */
unsigned rxrpc_dead_call_expiry = 2 * HZ; unsigned int rxrpc_dead_call_expiry = 2 * HZ;
const char *const rxrpc_call_states[NR__RXRPC_CALL_STATES] = { const char *const rxrpc_call_states[NR__RXRPC_CALL_STATES] = {
[RXRPC_CALL_CLIENT_SEND_REQUEST] = "ClSndReq", [RXRPC_CALL_CLIENT_SEND_REQUEST] = "ClSndReq",
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/* /*
* Time till a connection expires after last use (in seconds). * Time till a connection expires after last use (in seconds).
*/ */
unsigned rxrpc_connection_expiry = 10 * 60; unsigned int rxrpc_connection_expiry = 10 * 60;
static void rxrpc_connection_reaper(struct work_struct *work); static void rxrpc_connection_reaper(struct work_struct *work);
......
...@@ -478,12 +478,12 @@ int rxrpc_reject_call(struct rxrpc_sock *); ...@@ -478,12 +478,12 @@ int rxrpc_reject_call(struct rxrpc_sock *);
/* /*
* ar-ack.c * ar-ack.c
*/ */
extern unsigned rxrpc_requested_ack_delay; extern unsigned int rxrpc_requested_ack_delay;
extern unsigned rxrpc_soft_ack_delay; extern unsigned int rxrpc_soft_ack_delay;
extern unsigned rxrpc_idle_ack_delay; extern unsigned int rxrpc_idle_ack_delay;
extern unsigned rxrpc_rx_window_size; extern unsigned int rxrpc_rx_window_size;
extern unsigned rxrpc_rx_mtu; extern unsigned int rxrpc_rx_mtu;
extern unsigned rxrpc_rx_jumbo_max; extern unsigned int rxrpc_rx_jumbo_max;
void __rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool); void __rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool);
void rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool); void rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool);
...@@ -492,8 +492,8 @@ void rxrpc_process_call(struct work_struct *); ...@@ -492,8 +492,8 @@ void rxrpc_process_call(struct work_struct *);
/* /*
* ar-call.c * ar-call.c
*/ */
extern unsigned rxrpc_max_call_lifetime; extern unsigned int rxrpc_max_call_lifetime;
extern unsigned rxrpc_dead_call_expiry; extern unsigned int rxrpc_dead_call_expiry;
extern struct kmem_cache *rxrpc_call_jar; extern struct kmem_cache *rxrpc_call_jar;
extern struct list_head rxrpc_calls; extern struct list_head rxrpc_calls;
extern rwlock_t rxrpc_call_lock; extern rwlock_t rxrpc_call_lock;
...@@ -516,7 +516,7 @@ void __exit rxrpc_destroy_all_calls(void); ...@@ -516,7 +516,7 @@ void __exit rxrpc_destroy_all_calls(void);
/* /*
* ar-connection.c * ar-connection.c
*/ */
extern unsigned rxrpc_connection_expiry; extern unsigned int rxrpc_connection_expiry;
extern struct list_head rxrpc_connections; extern struct list_head rxrpc_connections;
extern rwlock_t rxrpc_connection_lock; extern rwlock_t rxrpc_connection_lock;
...@@ -579,7 +579,7 @@ int rxrpc_get_server_data_key(struct rxrpc_connection *, const void *, time_t, ...@@ -579,7 +579,7 @@ int rxrpc_get_server_data_key(struct rxrpc_connection *, const void *, time_t,
/* /*
* ar-output.c * ar-output.c
*/ */
extern unsigned rxrpc_resend_timeout; extern unsigned int rxrpc_resend_timeout;
int rxrpc_send_packet(struct rxrpc_transport *, struct sk_buff *); int rxrpc_send_packet(struct rxrpc_transport *, struct sk_buff *);
int rxrpc_client_sendmsg(struct rxrpc_sock *, struct rxrpc_transport *, int rxrpc_client_sendmsg(struct rxrpc_sock *, struct rxrpc_transport *,
...@@ -627,7 +627,7 @@ void rxrpc_packet_destructor(struct sk_buff *); ...@@ -627,7 +627,7 @@ void rxrpc_packet_destructor(struct sk_buff *);
/* /*
* ar-transport.c * ar-transport.c
*/ */
extern unsigned rxrpc_transport_expiry; extern unsigned int rxrpc_transport_expiry;
struct rxrpc_transport *rxrpc_get_transport(struct rxrpc_local *, struct rxrpc_transport *rxrpc_get_transport(struct rxrpc_local *,
struct rxrpc_peer *, gfp_t); struct rxrpc_peer *, gfp_t);
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/* /*
* Time till packet resend (in jiffies). * Time till packet resend (in jiffies).
*/ */
unsigned rxrpc_resend_timeout = 4 * HZ; unsigned int rxrpc_resend_timeout = 4 * HZ;
static int rxrpc_send_data(struct rxrpc_sock *rx, static int rxrpc_send_data(struct rxrpc_sock *rx,
struct rxrpc_call *call, struct rxrpc_call *call,
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
/* /*
* Time after last use at which transport record is cleaned up. * Time after last use at which transport record is cleaned up.
*/ */
unsigned rxrpc_transport_expiry = 3600 * 24; unsigned int rxrpc_transport_expiry = 3600 * 24;
static void rxrpc_transport_reaper(struct work_struct *work); static void rxrpc_transport_reaper(struct work_struct *work);
......
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
#include "ar-internal.h" #include "ar-internal.h"
static struct ctl_table_header *rxrpc_sysctl_reg_table; static struct ctl_table_header *rxrpc_sysctl_reg_table;
static const unsigned zero = 0; static const unsigned int zero = 0;
static const unsigned one = 1; static const unsigned int one = 1;
static const unsigned four = 4; static const unsigned int four = 4;
static const unsigned n_65535 = 65535; static const unsigned int n_65535 = 65535;
static const unsigned n_max_acks = RXRPC_MAXACKS; static const unsigned int n_max_acks = RXRPC_MAXACKS;
/* /*
* RxRPC operating parameters. * RxRPC operating parameters.
...@@ -32,7 +32,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { ...@@ -32,7 +32,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
{ {
.procname = "req_ack_delay", .procname = "req_ack_delay",
.data = &rxrpc_requested_ack_delay, .data = &rxrpc_requested_ack_delay,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_ms_jiffies, .proc_handler = proc_dointvec_ms_jiffies,
.extra1 = (void *)&zero, .extra1 = (void *)&zero,
...@@ -40,7 +40,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { ...@@ -40,7 +40,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
{ {
.procname = "soft_ack_delay", .procname = "soft_ack_delay",
.data = &rxrpc_soft_ack_delay, .data = &rxrpc_soft_ack_delay,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_ms_jiffies, .proc_handler = proc_dointvec_ms_jiffies,
.extra1 = (void *)&one, .extra1 = (void *)&one,
...@@ -48,7 +48,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { ...@@ -48,7 +48,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
{ {
.procname = "idle_ack_delay", .procname = "idle_ack_delay",
.data = &rxrpc_idle_ack_delay, .data = &rxrpc_idle_ack_delay,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_ms_jiffies, .proc_handler = proc_dointvec_ms_jiffies,
.extra1 = (void *)&one, .extra1 = (void *)&one,
...@@ -56,7 +56,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { ...@@ -56,7 +56,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
{ {
.procname = "resend_timeout", .procname = "resend_timeout",
.data = &rxrpc_resend_timeout, .data = &rxrpc_resend_timeout,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_ms_jiffies, .proc_handler = proc_dointvec_ms_jiffies,
.extra1 = (void *)&one, .extra1 = (void *)&one,
...@@ -66,7 +66,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { ...@@ -66,7 +66,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
{ {
.procname = "max_call_lifetime", .procname = "max_call_lifetime",
.data = &rxrpc_max_call_lifetime, .data = &rxrpc_max_call_lifetime,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_jiffies, .proc_handler = proc_dointvec_jiffies,
.extra1 = (void *)&one, .extra1 = (void *)&one,
...@@ -74,7 +74,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { ...@@ -74,7 +74,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
{ {
.procname = "dead_call_expiry", .procname = "dead_call_expiry",
.data = &rxrpc_dead_call_expiry, .data = &rxrpc_dead_call_expiry,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_jiffies, .proc_handler = proc_dointvec_jiffies,
.extra1 = (void *)&one, .extra1 = (void *)&one,
...@@ -84,7 +84,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { ...@@ -84,7 +84,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
{ {
.procname = "connection_expiry", .procname = "connection_expiry",
.data = &rxrpc_connection_expiry, .data = &rxrpc_connection_expiry,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void *)&one, .extra1 = (void *)&one,
...@@ -92,7 +92,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { ...@@ -92,7 +92,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
{ {
.procname = "transport_expiry", .procname = "transport_expiry",
.data = &rxrpc_transport_expiry, .data = &rxrpc_transport_expiry,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void *)&one, .extra1 = (void *)&one,
...@@ -102,7 +102,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { ...@@ -102,7 +102,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
{ {
.procname = "rx_window_size", .procname = "rx_window_size",
.data = &rxrpc_rx_window_size, .data = &rxrpc_rx_window_size,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void *)&one, .extra1 = (void *)&one,
...@@ -111,7 +111,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { ...@@ -111,7 +111,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
{ {
.procname = "rx_mtu", .procname = "rx_mtu",
.data = &rxrpc_rx_mtu, .data = &rxrpc_rx_mtu,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void *)&one, .extra1 = (void *)&one,
...@@ -120,7 +120,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { ...@@ -120,7 +120,7 @@ static struct ctl_table rxrpc_sysctl_table[] = {
{ {
.procname = "rx_jumbo_max", .procname = "rx_jumbo_max",
.data = &rxrpc_rx_jumbo_max, .data = &rxrpc_rx_jumbo_max,
.maxlen = sizeof(unsigned), .maxlen = sizeof(unsigned int),
.mode = 0644, .mode = 0644,
.proc_handler = proc_dointvec_minmax, .proc_handler = proc_dointvec_minmax,
.extra1 = (void *)&one, .extra1 = (void *)&one,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment