diff options
author | David Howells <dhowells@redhat.com> | 2016-03-09 18:22:56 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-03-13 15:14:57 -0400 |
commit | dad8aff754247781514c9d38f6db89557685136d (patch) | |
tree | 59b4c7dec17b8b0714a9dd55910debf3f29ccc51 /net/rxrpc | |
parent | 00e3d2ef184d005db4e14d64f5870d556183e638 (diff) |
rxrpc: Replace all unsigned with unsigned int
Replace all "unsigned" types with "unsigned int" types.
Reported-by: David Miller <davem@davemloft.net>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc')
-rw-r--r-- | net/rxrpc/af_rxrpc.c | 2 | ||||
-rw-r--r-- | net/rxrpc/ar-ack.c | 12 | ||||
-rw-r--r-- | net/rxrpc/ar-call.c | 4 | ||||
-rw-r--r-- | net/rxrpc/ar-connection.c | 2 | ||||
-rw-r--r-- | net/rxrpc/ar-internal.h | 22 | ||||
-rw-r--r-- | net/rxrpc/ar-output.c | 2 | ||||
-rw-r--r-- | net/rxrpc/ar-transport.c | 2 | ||||
-rw-r--r-- | net/rxrpc/sysctl.c | 32 |
8 files changed, 39 insertions, 39 deletions
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c index a76501757b59..9d935fa5a2a9 100644 --- a/net/rxrpc/af_rxrpc.c +++ b/net/rxrpc/af_rxrpc.c | |||
@@ -81,7 +81,7 @@ static int rxrpc_validate_address(struct rxrpc_sock *rx, | |||
81 | struct sockaddr_rxrpc *srx, | 81 | struct sockaddr_rxrpc *srx, |
82 | int len) | 82 | int len) |
83 | { | 83 | { |
84 | unsigned tail; | 84 | unsigned int tail; |
85 | 85 | ||
86 | if (len < sizeof(struct sockaddr_rxrpc)) | 86 | if (len < sizeof(struct sockaddr_rxrpc)) |
87 | return -EINVAL; | 87 | return -EINVAL; |
diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c index 20f3f001694e..16d967075eaf 100644 --- a/net/rxrpc/ar-ack.c +++ b/net/rxrpc/ar-ack.c | |||
@@ -23,7 +23,7 @@ | |||
23 | * How long to wait before scheduling ACK generation after seeing a | 23 | * How long to wait before scheduling ACK generation after seeing a |
24 | * packet with RXRPC_REQUEST_ACK set (in jiffies). | 24 | * packet with RXRPC_REQUEST_ACK set (in jiffies). |
25 | */ | 25 | */ |
26 | unsigned rxrpc_requested_ack_delay = 1; | 26 | unsigned int rxrpc_requested_ack_delay = 1; |
27 | 27 | ||
28 | /* | 28 | /* |
29 | * How long to wait before scheduling an ACK with subtype DELAY (in jiffies). | 29 | * How long to wait before scheduling an ACK with subtype DELAY (in jiffies). |
@@ -32,7 +32,7 @@ unsigned rxrpc_requested_ack_delay = 1; | |||
32 | * all consumed within this time we will send a DELAY ACK if an ACK was not | 32 | * all consumed within this time we will send a DELAY ACK if an ACK was not |
33 | * requested to let the sender know it doesn't need to resend. | 33 | * requested to let the sender know it doesn't need to resend. |
34 | */ | 34 | */ |
35 | unsigned rxrpc_soft_ack_delay = 1 * HZ; | 35 | unsigned int rxrpc_soft_ack_delay = 1 * HZ; |
36 | 36 | ||
37 | /* | 37 | /* |
38 | * How long to wait before scheduling an ACK with subtype IDLE (in jiffies). | 38 | * 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 | * further packets aren't immediately received to decide when to send an IDLE | 41 | * further packets aren't immediately received to decide when to send an IDLE |
42 | * ACK let the other end know that it can free up its Tx buffer space. | 42 | * ACK let the other end know that it can free up its Tx buffer space. |
43 | */ | 43 | */ |
44 | unsigned rxrpc_idle_ack_delay = 0.5 * HZ; | 44 | unsigned int rxrpc_idle_ack_delay = 0.5 * HZ; |
45 | 45 | ||
46 | /* | 46 | /* |
47 | * Receive window size in packets. This indicates the maximum number of | 47 | * Receive window size in packets. This indicates the maximum number of |
@@ -49,19 +49,19 @@ unsigned rxrpc_idle_ack_delay = 0.5 * HZ; | |||
49 | * limit is hit, we should generate an EXCEEDS_WINDOW ACK and discard further | 49 | * limit is hit, we should generate an EXCEEDS_WINDOW ACK and discard further |
50 | * packets. | 50 | * packets. |
51 | */ | 51 | */ |
52 | unsigned rxrpc_rx_window_size = 32; | 52 | unsigned int rxrpc_rx_window_size = 32; |
53 | 53 | ||
54 | /* | 54 | /* |
55 | * Maximum Rx MTU size. This indicates to the sender the size of jumbo packet | 55 | * Maximum Rx MTU size. This indicates to the sender the size of jumbo packet |
56 | * made by gluing normal packets together that we're willing to handle. | 56 | * made by gluing normal packets together that we're willing to handle. |
57 | */ | 57 | */ |
58 | unsigned rxrpc_rx_mtu = 5692; | 58 | unsigned int rxrpc_rx_mtu = 5692; |
59 | 59 | ||
60 | /* | 60 | /* |
61 | * The maximum number of fragments in a received jumbo packet that we tell the | 61 | * The maximum number of fragments in a received jumbo packet that we tell the |
62 | * sender that we're willing to handle. | 62 | * sender that we're willing to handle. |
63 | */ | 63 | */ |
64 | unsigned rxrpc_rx_jumbo_max = 4; | 64 | unsigned int rxrpc_rx_jumbo_max = 4; |
65 | 65 | ||
66 | static const char *rxrpc_acks(u8 reason) | 66 | static const char *rxrpc_acks(u8 reason) |
67 | { | 67 | { |
diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c index 4a499e0100f1..7c8d300ade9b 100644 --- a/net/rxrpc/ar-call.c +++ b/net/rxrpc/ar-call.c | |||
@@ -21,12 +21,12 @@ | |||
21 | /* | 21 | /* |
22 | * Maximum lifetime of a call (in jiffies). | 22 | * Maximum lifetime of a call (in jiffies). |
23 | */ | 23 | */ |
24 | unsigned rxrpc_max_call_lifetime = 60 * HZ; | 24 | unsigned int rxrpc_max_call_lifetime = 60 * HZ; |
25 | 25 | ||
26 | /* | 26 | /* |
27 | * Time till dead call expires after last use (in jiffies). | 27 | * Time till dead call expires after last use (in jiffies). |
28 | */ | 28 | */ |
29 | unsigned rxrpc_dead_call_expiry = 2 * HZ; | 29 | unsigned int rxrpc_dead_call_expiry = 2 * HZ; |
30 | 30 | ||
31 | const char *const rxrpc_call_states[NR__RXRPC_CALL_STATES] = { | 31 | const char *const rxrpc_call_states[NR__RXRPC_CALL_STATES] = { |
32 | [RXRPC_CALL_CLIENT_SEND_REQUEST] = "ClSndReq", | 32 | [RXRPC_CALL_CLIENT_SEND_REQUEST] = "ClSndReq", |
diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c index 53df14cb8d25..9942da1edbf6 100644 --- a/net/rxrpc/ar-connection.c +++ b/net/rxrpc/ar-connection.c | |||
@@ -21,7 +21,7 @@ | |||
21 | /* | 21 | /* |
22 | * Time till a connection expires after last use (in seconds). | 22 | * Time till a connection expires after last use (in seconds). |
23 | */ | 23 | */ |
24 | unsigned rxrpc_connection_expiry = 10 * 60; | 24 | unsigned int rxrpc_connection_expiry = 10 * 60; |
25 | 25 | ||
26 | static void rxrpc_connection_reaper(struct work_struct *work); | 26 | static void rxrpc_connection_reaper(struct work_struct *work); |
27 | 27 | ||
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index 8b495aed517d..a3002f4ddc90 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h | |||
@@ -478,12 +478,12 @@ int rxrpc_reject_call(struct rxrpc_sock *); | |||
478 | /* | 478 | /* |
479 | * ar-ack.c | 479 | * ar-ack.c |
480 | */ | 480 | */ |
481 | extern unsigned rxrpc_requested_ack_delay; | 481 | extern unsigned int rxrpc_requested_ack_delay; |
482 | extern unsigned rxrpc_soft_ack_delay; | 482 | extern unsigned int rxrpc_soft_ack_delay; |
483 | extern unsigned rxrpc_idle_ack_delay; | 483 | extern unsigned int rxrpc_idle_ack_delay; |
484 | extern unsigned rxrpc_rx_window_size; | 484 | extern unsigned int rxrpc_rx_window_size; |
485 | extern unsigned rxrpc_rx_mtu; | 485 | extern unsigned int rxrpc_rx_mtu; |
486 | extern unsigned rxrpc_rx_jumbo_max; | 486 | extern unsigned int rxrpc_rx_jumbo_max; |
487 | 487 | ||
488 | void __rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool); | 488 | void __rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool); |
489 | void rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool); | 489 | void rxrpc_propose_ACK(struct rxrpc_call *, u8, u32, bool); |
@@ -492,8 +492,8 @@ void rxrpc_process_call(struct work_struct *); | |||
492 | /* | 492 | /* |
493 | * ar-call.c | 493 | * ar-call.c |
494 | */ | 494 | */ |
495 | extern unsigned rxrpc_max_call_lifetime; | 495 | extern unsigned int rxrpc_max_call_lifetime; |
496 | extern unsigned rxrpc_dead_call_expiry; | 496 | extern unsigned int rxrpc_dead_call_expiry; |
497 | extern struct kmem_cache *rxrpc_call_jar; | 497 | extern struct kmem_cache *rxrpc_call_jar; |
498 | extern struct list_head rxrpc_calls; | 498 | extern struct list_head rxrpc_calls; |
499 | extern rwlock_t rxrpc_call_lock; | 499 | extern rwlock_t rxrpc_call_lock; |
@@ -516,7 +516,7 @@ void __exit rxrpc_destroy_all_calls(void); | |||
516 | /* | 516 | /* |
517 | * ar-connection.c | 517 | * ar-connection.c |
518 | */ | 518 | */ |
519 | extern unsigned rxrpc_connection_expiry; | 519 | extern unsigned int rxrpc_connection_expiry; |
520 | extern struct list_head rxrpc_connections; | 520 | extern struct list_head rxrpc_connections; |
521 | extern rwlock_t rxrpc_connection_lock; | 521 | extern rwlock_t rxrpc_connection_lock; |
522 | 522 | ||
@@ -579,7 +579,7 @@ int rxrpc_get_server_data_key(struct rxrpc_connection *, const void *, time_t, | |||
579 | /* | 579 | /* |
580 | * ar-output.c | 580 | * ar-output.c |
581 | */ | 581 | */ |
582 | extern unsigned rxrpc_resend_timeout; | 582 | extern unsigned int rxrpc_resend_timeout; |
583 | 583 | ||
584 | int rxrpc_send_packet(struct rxrpc_transport *, struct sk_buff *); | 584 | int rxrpc_send_packet(struct rxrpc_transport *, struct sk_buff *); |
585 | int rxrpc_client_sendmsg(struct rxrpc_sock *, struct rxrpc_transport *, | 585 | int rxrpc_client_sendmsg(struct rxrpc_sock *, struct rxrpc_transport *, |
@@ -627,7 +627,7 @@ void rxrpc_packet_destructor(struct sk_buff *); | |||
627 | /* | 627 | /* |
628 | * ar-transport.c | 628 | * ar-transport.c |
629 | */ | 629 | */ |
630 | extern unsigned rxrpc_transport_expiry; | 630 | extern unsigned int rxrpc_transport_expiry; |
631 | 631 | ||
632 | struct rxrpc_transport *rxrpc_get_transport(struct rxrpc_local *, | 632 | struct rxrpc_transport *rxrpc_get_transport(struct rxrpc_local *, |
633 | struct rxrpc_peer *, gfp_t); | 633 | struct rxrpc_peer *, gfp_t); |
diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c index 14c8df6b7f41..d36fb6e1a29c 100644 --- a/net/rxrpc/ar-output.c +++ b/net/rxrpc/ar-output.c | |||
@@ -21,7 +21,7 @@ | |||
21 | /* | 21 | /* |
22 | * Time till packet resend (in jiffies). | 22 | * Time till packet resend (in jiffies). |
23 | */ | 23 | */ |
24 | unsigned rxrpc_resend_timeout = 4 * HZ; | 24 | unsigned int rxrpc_resend_timeout = 4 * HZ; |
25 | 25 | ||
26 | static int rxrpc_send_data(struct rxrpc_sock *rx, | 26 | static int rxrpc_send_data(struct rxrpc_sock *rx, |
27 | struct rxrpc_call *call, | 27 | struct rxrpc_call *call, |
diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c index 5f9b9d462f53..66a1a5676446 100644 --- a/net/rxrpc/ar-transport.c +++ b/net/rxrpc/ar-transport.c | |||
@@ -20,7 +20,7 @@ | |||
20 | /* | 20 | /* |
21 | * Time after last use at which transport record is cleaned up. | 21 | * Time after last use at which transport record is cleaned up. |
22 | */ | 22 | */ |
23 | unsigned rxrpc_transport_expiry = 3600 * 24; | 23 | unsigned int rxrpc_transport_expiry = 3600 * 24; |
24 | 24 | ||
25 | static void rxrpc_transport_reaper(struct work_struct *work); | 25 | static void rxrpc_transport_reaper(struct work_struct *work); |
26 | 26 | ||
diff --git a/net/rxrpc/sysctl.c b/net/rxrpc/sysctl.c index 093547ac2bcd..d20ed575acf4 100644 --- a/net/rxrpc/sysctl.c +++ b/net/rxrpc/sysctl.c | |||
@@ -15,11 +15,11 @@ | |||
15 | #include "ar-internal.h" | 15 | #include "ar-internal.h" |
16 | 16 | ||
17 | static struct ctl_table_header *rxrpc_sysctl_reg_table; | 17 | static struct ctl_table_header *rxrpc_sysctl_reg_table; |
18 | static const unsigned zero = 0; | 18 | static const unsigned int zero = 0; |
19 | static const unsigned one = 1; | 19 | static const unsigned int one = 1; |
20 | static const unsigned four = 4; | 20 | static const unsigned int four = 4; |
21 | static const unsigned n_65535 = 65535; | 21 | static const unsigned int n_65535 = 65535; |
22 | static const unsigned n_max_acks = RXRPC_MAXACKS; | 22 | static const unsigned int n_max_acks = RXRPC_MAXACKS; |
23 | 23 | ||
24 | /* | 24 | /* |
25 | * RxRPC operating parameters. | 25 | * RxRPC operating parameters. |
@@ -32,7 +32,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { | |||
32 | { | 32 | { |
33 | .procname = "req_ack_delay", | 33 | .procname = "req_ack_delay", |
34 | .data = &rxrpc_requested_ack_delay, | 34 | .data = &rxrpc_requested_ack_delay, |
35 | .maxlen = sizeof(unsigned), | 35 | .maxlen = sizeof(unsigned int), |
36 | .mode = 0644, | 36 | .mode = 0644, |
37 | .proc_handler = proc_dointvec_ms_jiffies, | 37 | .proc_handler = proc_dointvec_ms_jiffies, |
38 | .extra1 = (void *)&zero, | 38 | .extra1 = (void *)&zero, |
@@ -40,7 +40,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { | |||
40 | { | 40 | { |
41 | .procname = "soft_ack_delay", | 41 | .procname = "soft_ack_delay", |
42 | .data = &rxrpc_soft_ack_delay, | 42 | .data = &rxrpc_soft_ack_delay, |
43 | .maxlen = sizeof(unsigned), | 43 | .maxlen = sizeof(unsigned int), |
44 | .mode = 0644, | 44 | .mode = 0644, |
45 | .proc_handler = proc_dointvec_ms_jiffies, | 45 | .proc_handler = proc_dointvec_ms_jiffies, |
46 | .extra1 = (void *)&one, | 46 | .extra1 = (void *)&one, |
@@ -48,7 +48,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { | |||
48 | { | 48 | { |
49 | .procname = "idle_ack_delay", | 49 | .procname = "idle_ack_delay", |
50 | .data = &rxrpc_idle_ack_delay, | 50 | .data = &rxrpc_idle_ack_delay, |
51 | .maxlen = sizeof(unsigned), | 51 | .maxlen = sizeof(unsigned int), |
52 | .mode = 0644, | 52 | .mode = 0644, |
53 | .proc_handler = proc_dointvec_ms_jiffies, | 53 | .proc_handler = proc_dointvec_ms_jiffies, |
54 | .extra1 = (void *)&one, | 54 | .extra1 = (void *)&one, |
@@ -56,7 +56,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { | |||
56 | { | 56 | { |
57 | .procname = "resend_timeout", | 57 | .procname = "resend_timeout", |
58 | .data = &rxrpc_resend_timeout, | 58 | .data = &rxrpc_resend_timeout, |
59 | .maxlen = sizeof(unsigned), | 59 | .maxlen = sizeof(unsigned int), |
60 | .mode = 0644, | 60 | .mode = 0644, |
61 | .proc_handler = proc_dointvec_ms_jiffies, | 61 | .proc_handler = proc_dointvec_ms_jiffies, |
62 | .extra1 = (void *)&one, | 62 | .extra1 = (void *)&one, |
@@ -66,7 +66,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { | |||
66 | { | 66 | { |
67 | .procname = "max_call_lifetime", | 67 | .procname = "max_call_lifetime", |
68 | .data = &rxrpc_max_call_lifetime, | 68 | .data = &rxrpc_max_call_lifetime, |
69 | .maxlen = sizeof(unsigned), | 69 | .maxlen = sizeof(unsigned int), |
70 | .mode = 0644, | 70 | .mode = 0644, |
71 | .proc_handler = proc_dointvec_jiffies, | 71 | .proc_handler = proc_dointvec_jiffies, |
72 | .extra1 = (void *)&one, | 72 | .extra1 = (void *)&one, |
@@ -74,7 +74,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { | |||
74 | { | 74 | { |
75 | .procname = "dead_call_expiry", | 75 | .procname = "dead_call_expiry", |
76 | .data = &rxrpc_dead_call_expiry, | 76 | .data = &rxrpc_dead_call_expiry, |
77 | .maxlen = sizeof(unsigned), | 77 | .maxlen = sizeof(unsigned int), |
78 | .mode = 0644, | 78 | .mode = 0644, |
79 | .proc_handler = proc_dointvec_jiffies, | 79 | .proc_handler = proc_dointvec_jiffies, |
80 | .extra1 = (void *)&one, | 80 | .extra1 = (void *)&one, |
@@ -84,7 +84,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { | |||
84 | { | 84 | { |
85 | .procname = "connection_expiry", | 85 | .procname = "connection_expiry", |
86 | .data = &rxrpc_connection_expiry, | 86 | .data = &rxrpc_connection_expiry, |
87 | .maxlen = sizeof(unsigned), | 87 | .maxlen = sizeof(unsigned int), |
88 | .mode = 0644, | 88 | .mode = 0644, |
89 | .proc_handler = proc_dointvec_minmax, | 89 | .proc_handler = proc_dointvec_minmax, |
90 | .extra1 = (void *)&one, | 90 | .extra1 = (void *)&one, |
@@ -92,7 +92,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { | |||
92 | { | 92 | { |
93 | .procname = "transport_expiry", | 93 | .procname = "transport_expiry", |
94 | .data = &rxrpc_transport_expiry, | 94 | .data = &rxrpc_transport_expiry, |
95 | .maxlen = sizeof(unsigned), | 95 | .maxlen = sizeof(unsigned int), |
96 | .mode = 0644, | 96 | .mode = 0644, |
97 | .proc_handler = proc_dointvec_minmax, | 97 | .proc_handler = proc_dointvec_minmax, |
98 | .extra1 = (void *)&one, | 98 | .extra1 = (void *)&one, |
@@ -102,7 +102,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { | |||
102 | { | 102 | { |
103 | .procname = "rx_window_size", | 103 | .procname = "rx_window_size", |
104 | .data = &rxrpc_rx_window_size, | 104 | .data = &rxrpc_rx_window_size, |
105 | .maxlen = sizeof(unsigned), | 105 | .maxlen = sizeof(unsigned int), |
106 | .mode = 0644, | 106 | .mode = 0644, |
107 | .proc_handler = proc_dointvec_minmax, | 107 | .proc_handler = proc_dointvec_minmax, |
108 | .extra1 = (void *)&one, | 108 | .extra1 = (void *)&one, |
@@ -111,7 +111,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { | |||
111 | { | 111 | { |
112 | .procname = "rx_mtu", | 112 | .procname = "rx_mtu", |
113 | .data = &rxrpc_rx_mtu, | 113 | .data = &rxrpc_rx_mtu, |
114 | .maxlen = sizeof(unsigned), | 114 | .maxlen = sizeof(unsigned int), |
115 | .mode = 0644, | 115 | .mode = 0644, |
116 | .proc_handler = proc_dointvec_minmax, | 116 | .proc_handler = proc_dointvec_minmax, |
117 | .extra1 = (void *)&one, | 117 | .extra1 = (void *)&one, |
@@ -120,7 +120,7 @@ static struct ctl_table rxrpc_sysctl_table[] = { | |||
120 | { | 120 | { |
121 | .procname = "rx_jumbo_max", | 121 | .procname = "rx_jumbo_max", |
122 | .data = &rxrpc_rx_jumbo_max, | 122 | .data = &rxrpc_rx_jumbo_max, |
123 | .maxlen = sizeof(unsigned), | 123 | .maxlen = sizeof(unsigned int), |
124 | .mode = 0644, | 124 | .mode = 0644, |
125 | .proc_handler = proc_dointvec_minmax, | 125 | .proc_handler = proc_dointvec_minmax, |
126 | .extra1 = (void *)&one, | 126 | .extra1 = (void *)&one, |