aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2012-04-15 01:58:06 -0400
committerDavid S. Miller <davem@davemloft.net>2012-04-15 12:44:40 -0400
commit95c961747284a6b83a5e2d81240e214b0fa3464d (patch)
treec7be86a00db3605a48a03109fafcbe31039ca2e0 /net/dccp
parent5e73ea1a31c3612aa6dfe44f864ca5b7b6a4cff9 (diff)
net: cleanup unsigned to unsigned int
Use of "unsigned int" is preferred to bare "unsigned" in net tree. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
-rw-r--r--net/dccp/ccids/ccid3.c12
-rw-r--r--net/dccp/dccp.h8
-rw-r--r--net/dccp/input.c10
3 files changed, 15 insertions, 15 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 70bfaf2d1965..8c67bedf85b0 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -100,7 +100,7 @@ static void ccid3_update_send_interval(struct ccid3_hc_tx_sock *hc)
100 100
101 DCCP_BUG_ON(hc->tx_t_ipi == 0); 101 DCCP_BUG_ON(hc->tx_t_ipi == 0);
102 ccid3_pr_debug("t_ipi=%u, s=%u, X=%u\n", hc->tx_t_ipi, 102 ccid3_pr_debug("t_ipi=%u, s=%u, X=%u\n", hc->tx_t_ipi,
103 hc->tx_s, (unsigned)(hc->tx_x >> 6)); 103 hc->tx_s, (unsigned int)(hc->tx_x >> 6));
104} 104}
105 105
106static u32 ccid3_hc_tx_idle_rtt(struct ccid3_hc_tx_sock *hc, ktime_t now) 106static u32 ccid3_hc_tx_idle_rtt(struct ccid3_hc_tx_sock *hc, ktime_t now)
@@ -153,9 +153,9 @@ static void ccid3_hc_tx_update_x(struct sock *sk, ktime_t *stamp)
153 153
154 if (hc->tx_x != old_x) { 154 if (hc->tx_x != old_x) {
155 ccid3_pr_debug("X_prev=%u, X_now=%u, X_calc=%u, " 155 ccid3_pr_debug("X_prev=%u, X_now=%u, X_calc=%u, "
156 "X_recv=%u\n", (unsigned)(old_x >> 6), 156 "X_recv=%u\n", (unsigned int)(old_x >> 6),
157 (unsigned)(hc->tx_x >> 6), hc->tx_x_calc, 157 (unsigned int)(hc->tx_x >> 6), hc->tx_x_calc,
158 (unsigned)(hc->tx_x_recv >> 6)); 158 (unsigned int)(hc->tx_x_recv >> 6));
159 159
160 ccid3_update_send_interval(hc); 160 ccid3_update_send_interval(hc);
161 } 161 }
@@ -425,8 +425,8 @@ done_computing_x:
425 "p=%u, X_calc=%u, X_recv=%u, X=%u\n", 425 "p=%u, X_calc=%u, X_recv=%u, X=%u\n",
426 dccp_role(sk), sk, hc->tx_rtt, r_sample, 426 dccp_role(sk), sk, hc->tx_rtt, r_sample,
427 hc->tx_s, hc->tx_p, hc->tx_x_calc, 427 hc->tx_s, hc->tx_p, hc->tx_x_calc,
428 (unsigned)(hc->tx_x_recv >> 6), 428 (unsigned int)(hc->tx_x_recv >> 6),
429 (unsigned)(hc->tx_x >> 6)); 429 (unsigned int)(hc->tx_x >> 6));
430 430
431 /* unschedule no feedback timer */ 431 /* unschedule no feedback timer */
432 sk_stop_timer(sk, &hc->tx_no_feedback_timer); 432 sk_stop_timer(sk, &hc->tx_no_feedback_timer);
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index 29d6bb629a6c..9040be049d8c 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -75,7 +75,7 @@ extern void dccp_time_wait(struct sock *sk, int state, int timeo);
75 * state, about 60 seconds */ 75 * state, about 60 seconds */
76 76
77/* RFC 1122, 4.2.3.1 initial RTO value */ 77/* RFC 1122, 4.2.3.1 initial RTO value */
78#define DCCP_TIMEOUT_INIT ((unsigned)(3 * HZ)) 78#define DCCP_TIMEOUT_INIT ((unsigned int)(3 * HZ))
79 79
80/* 80/*
81 * The maximum back-off value for retransmissions. This is needed for 81 * The maximum back-off value for retransmissions. This is needed for
@@ -84,7 +84,7 @@ extern void dccp_time_wait(struct sock *sk, int state, int timeo);
84 * - feature-negotiation retransmission (sec. 6.6.3), 84 * - feature-negotiation retransmission (sec. 6.6.3),
85 * - Acks in client-PARTOPEN state (sec. 8.1.5). 85 * - Acks in client-PARTOPEN state (sec. 8.1.5).
86 */ 86 */
87#define DCCP_RTO_MAX ((unsigned)(64 * HZ)) 87#define DCCP_RTO_MAX ((unsigned int)(64 * HZ))
88 88
89/* 89/*
90 * RTT sampling: sanity bounds and fallback RTT value from RFC 4340, section 3.4 90 * RTT sampling: sanity bounds and fallback RTT value from RFC 4340, section 3.4
@@ -287,9 +287,9 @@ extern struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb,
287extern int dccp_child_process(struct sock *parent, struct sock *child, 287extern int dccp_child_process(struct sock *parent, struct sock *child,
288 struct sk_buff *skb); 288 struct sk_buff *skb);
289extern int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, 289extern int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
290 struct dccp_hdr *dh, unsigned len); 290 struct dccp_hdr *dh, unsigned int len);
291extern int dccp_rcv_established(struct sock *sk, struct sk_buff *skb, 291extern int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
292 const struct dccp_hdr *dh, const unsigned len); 292 const struct dccp_hdr *dh, const unsigned int len);
293 293
294extern int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized); 294extern int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized);
295extern void dccp_destroy_sock(struct sock *sk); 295extern void dccp_destroy_sock(struct sock *sk);
diff --git a/net/dccp/input.c b/net/dccp/input.c
index 51d5fe5fffba..bc93a333931e 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -285,7 +285,7 @@ static int dccp_check_seqno(struct sock *sk, struct sk_buff *skb)
285} 285}
286 286
287static int __dccp_rcv_established(struct sock *sk, struct sk_buff *skb, 287static int __dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
288 const struct dccp_hdr *dh, const unsigned len) 288 const struct dccp_hdr *dh, const unsigned int len)
289{ 289{
290 struct dccp_sock *dp = dccp_sk(sk); 290 struct dccp_sock *dp = dccp_sk(sk);
291 291
@@ -366,7 +366,7 @@ discard:
366} 366}
367 367
368int dccp_rcv_established(struct sock *sk, struct sk_buff *skb, 368int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,
369 const struct dccp_hdr *dh, const unsigned len) 369 const struct dccp_hdr *dh, const unsigned int len)
370{ 370{
371 if (dccp_check_seqno(sk, skb)) 371 if (dccp_check_seqno(sk, skb))
372 goto discard; 372 goto discard;
@@ -388,7 +388,7 @@ EXPORT_SYMBOL_GPL(dccp_rcv_established);
388static int dccp_rcv_request_sent_state_process(struct sock *sk, 388static int dccp_rcv_request_sent_state_process(struct sock *sk,
389 struct sk_buff *skb, 389 struct sk_buff *skb,
390 const struct dccp_hdr *dh, 390 const struct dccp_hdr *dh,
391 const unsigned len) 391 const unsigned int len)
392{ 392{
393 /* 393 /*
394 * Step 4: Prepare sequence numbers in REQUEST 394 * Step 4: Prepare sequence numbers in REQUEST
@@ -521,7 +521,7 @@ unable_to_proceed:
521static int dccp_rcv_respond_partopen_state_process(struct sock *sk, 521static int dccp_rcv_respond_partopen_state_process(struct sock *sk,
522 struct sk_buff *skb, 522 struct sk_buff *skb,
523 const struct dccp_hdr *dh, 523 const struct dccp_hdr *dh,
524 const unsigned len) 524 const unsigned int len)
525{ 525{
526 struct dccp_sock *dp = dccp_sk(sk); 526 struct dccp_sock *dp = dccp_sk(sk);
527 u32 sample = dp->dccps_options_received.dccpor_timestamp_echo; 527 u32 sample = dp->dccps_options_received.dccpor_timestamp_echo;
@@ -572,7 +572,7 @@ static int dccp_rcv_respond_partopen_state_process(struct sock *sk,
572} 572}
573 573
574int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, 574int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
575 struct dccp_hdr *dh, unsigned len) 575 struct dccp_hdr *dh, unsigned int len)
576{ 576{
577 struct dccp_sock *dp = dccp_sk(sk); 577 struct dccp_sock *dp = dccp_sk(sk);
578 struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb); 578 struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);