aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>2007-02-09 09:24:38 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2007-02-11 02:19:27 -0500
commitc9eaf17341834de00351bf79f16b2d879c8aea96 (patch)
treed8b2005197444fa6b6bdf8e8c8fd6eaf2db9ecd7 /net
parent4ec93edb14fe5fdee9fae6335f2cbba204627eac (diff)
[NET] DCCP: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/dccp/ccids/ccid2.c68
-rw-r--r--net/dccp/ccids/ccid3.c14
-rw-r--r--net/dccp/ccids/lib/packet_history.h4
-rw-r--r--net/dccp/ccids/lib/tfrc_equation.c18
-rw-r--r--net/dccp/dccp.h8
-rw-r--r--net/dccp/feat.c8
-rw-r--r--net/dccp/feat.h2
-rw-r--r--net/dccp/input.c14
-rw-r--r--net/dccp/ipv4.c6
-rw-r--r--net/dccp/ipv6.c2
-rw-r--r--net/dccp/options.c4
-rw-r--r--net/dccp/output.c4
-rw-r--r--net/dccp/proto.c2
-rw-r--r--net/dccp/timer.c2
14 files changed, 78 insertions, 78 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index fd38b05d6f79..248d20f4c7c4 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -139,7 +139,7 @@ static int ccid2_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
139 return 0; 139 return 0;
140 } 140 }
141 141
142 hctx = ccid2_hc_tx_sk(sk); 142 hctx = ccid2_hc_tx_sk(sk);
143 143
144 ccid2_pr_debug("pipe=%d cwnd=%d\n", hctx->ccid2hctx_pipe, 144 ccid2_pr_debug("pipe=%d cwnd=%d\n", hctx->ccid2hctx_pipe,
145 hctx->ccid2hctx_cwnd); 145 hctx->ccid2hctx_cwnd);
@@ -368,13 +368,13 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
368static int ccid2_ackvector(struct sock *sk, struct sk_buff *skb, int offset, 368static int ccid2_ackvector(struct sock *sk, struct sk_buff *skb, int offset,
369 unsigned char **vec, unsigned char *veclen) 369 unsigned char **vec, unsigned char *veclen)
370{ 370{
371 const struct dccp_hdr *dh = dccp_hdr(skb); 371 const struct dccp_hdr *dh = dccp_hdr(skb);
372 unsigned char *options = (unsigned char *)dh + dccp_hdr_len(skb); 372 unsigned char *options = (unsigned char *)dh + dccp_hdr_len(skb);
373 unsigned char *opt_ptr; 373 unsigned char *opt_ptr;
374 const unsigned char *opt_end = (unsigned char *)dh + 374 const unsigned char *opt_end = (unsigned char *)dh +
375 (dh->dccph_doff * 4); 375 (dh->dccph_doff * 4);
376 unsigned char opt, len; 376 unsigned char opt, len;
377 unsigned char *value; 377 unsigned char *value;
378 378
379 BUG_ON(offset < 0); 379 BUG_ON(offset < 0);
380 options += offset; 380 options += offset;
@@ -383,29 +383,29 @@ static int ccid2_ackvector(struct sock *sk, struct sk_buff *skb, int offset,
383 return -1; 383 return -1;
384 384
385 while (opt_ptr != opt_end) { 385 while (opt_ptr != opt_end) {
386 opt = *opt_ptr++; 386 opt = *opt_ptr++;
387 len = 0; 387 len = 0;
388 value = NULL; 388 value = NULL;
389 389
390 /* Check if this isn't a single byte option */ 390 /* Check if this isn't a single byte option */
391 if (opt > DCCPO_MAX_RESERVED) { 391 if (opt > DCCPO_MAX_RESERVED) {
392 if (opt_ptr == opt_end) 392 if (opt_ptr == opt_end)
393 goto out_invalid_option; 393 goto out_invalid_option;
394 394
395 len = *opt_ptr++; 395 len = *opt_ptr++;
396 if (len < 3) 396 if (len < 3)
397 goto out_invalid_option; 397 goto out_invalid_option;
398 /* 398 /*
399 * Remove the type and len fields, leaving 399 * Remove the type and len fields, leaving
400 * just the value size 400 * just the value size
401 */ 401 */
402 len -= 2; 402 len -= 2;
403 value = opt_ptr; 403 value = opt_ptr;
404 opt_ptr += len; 404 opt_ptr += len;
405 405
406 if (opt_ptr > opt_end) 406 if (opt_ptr > opt_end)
407 goto out_invalid_option; 407 goto out_invalid_option;
408 } 408 }
409 409
410 switch (opt) { 410 switch (opt) {
411 case DCCPO_ACK_VECTOR_0: 411 case DCCPO_ACK_VECTOR_0:
@@ -432,7 +432,7 @@ static void ccid2_hc_tx_kill_rto_timer(struct sock *sk)
432} 432}
433 433
434static inline void ccid2_new_ack(struct sock *sk, 434static inline void ccid2_new_ack(struct sock *sk,
435 struct ccid2_seq *seqp, 435 struct ccid2_seq *seqp,
436 unsigned int *maxincr) 436 unsigned int *maxincr)
437{ 437{
438 struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk); 438 struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
@@ -759,7 +759,7 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
759 759
760static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk) 760static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk)
761{ 761{
762 struct ccid2_hc_tx_sock *hctx = ccid_priv(ccid); 762 struct ccid2_hc_tx_sock *hctx = ccid_priv(ccid);
763 763
764 ccid2_change_cwnd(hctx, 1); 764 ccid2_change_cwnd(hctx, 1);
765 /* Initialize ssthresh to infinity. This means that we will exit the 765 /* Initialize ssthresh to infinity. This means that we will exit the
@@ -793,7 +793,7 @@ static int ccid2_hc_tx_init(struct ccid *ccid, struct sock *sk)
793 793
794static void ccid2_hc_tx_exit(struct sock *sk) 794static void ccid2_hc_tx_exit(struct sock *sk)
795{ 795{
796 struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk); 796 struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
797 int i; 797 int i;
798 798
799 ccid2_hc_tx_kill_rto_timer(sk); 799 ccid2_hc_tx_kill_rto_timer(sk);
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 5c452a3ec4d1..5361a4d8e13b 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -284,7 +284,7 @@ static void ccid3_hc_tx_no_feedback_timer(unsigned long data)
284 284
285restart_timer: 285restart_timer:
286 sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer, 286 sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
287 jiffies + usecs_to_jiffies(t_nfb)); 287 jiffies + usecs_to_jiffies(t_nfb));
288out: 288out:
289 bh_unlock_sock(sk); 289 bh_unlock_sock(sk);
290 sock_put(sk); 290 sock_put(sk);
@@ -319,7 +319,7 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
319 case TFRC_SSTATE_NO_SENT: 319 case TFRC_SSTATE_NO_SENT:
320 sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer, 320 sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
321 (jiffies + 321 (jiffies +
322 usecs_to_jiffies(TFRC_INITIAL_TIMEOUT))); 322 usecs_to_jiffies(TFRC_INITIAL_TIMEOUT)));
323 hctx->ccid3hctx_last_win_count = 0; 323 hctx->ccid3hctx_last_win_count = 0;
324 hctx->ccid3hctx_t_last_win_count = now; 324 hctx->ccid3hctx_t_last_win_count = now;
325 ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK); 325 ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK);
@@ -487,7 +487,7 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
487 ccid3_hc_tx_set_state(sk, TFRC_SSTATE_FBACK); 487 ccid3_hc_tx_set_state(sk, TFRC_SSTATE_FBACK);
488 } else { 488 } else {
489 hctx->ccid3hctx_rtt = (9 * hctx->ccid3hctx_rtt + 489 hctx->ccid3hctx_rtt = (9 * hctx->ccid3hctx_rtt +
490 (u32)r_sample) / 10; 490 (u32)r_sample) / 10;
491 491
492 /* Update sending rate (step 4 of [RFC 3448, 4.3]) */ 492 /* Update sending rate (step 4 of [RFC 3448, 4.3]) */
493 if (hctx->ccid3hctx_p > 0) 493 if (hctx->ccid3hctx_p > 0)
@@ -924,7 +924,7 @@ static void ccid3_hc_rx_update_li(struct sock *sk, u64 seq_loss, u8 win_loss)
924} 924}
925 925
926static int ccid3_hc_rx_detect_loss(struct sock *sk, 926static int ccid3_hc_rx_detect_loss(struct sock *sk,
927 struct dccp_rx_hist_entry *packet) 927 struct dccp_rx_hist_entry *packet)
928{ 928{
929 struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk); 929 struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
930 struct dccp_rx_hist_entry *rx_hist = 930 struct dccp_rx_hist_entry *rx_hist =
@@ -1074,7 +1074,7 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
1074 dccp_role(sk), sk, dccp_state_name(sk->sk_state)); 1074 dccp_role(sk), sk, dccp_state_name(sk->sk_state));
1075 1075
1076 p_prev = hcrx->ccid3hcrx_p; 1076 p_prev = hcrx->ccid3hcrx_p;
1077 1077
1078 /* Calculate loss event rate */ 1078 /* Calculate loss event rate */
1079 if (!list_empty(&hcrx->ccid3hcrx_li_hist)) { 1079 if (!list_empty(&hcrx->ccid3hcrx_li_hist)) {
1080 u32 i_mean = dccp_li_hist_calc_i_mean(&hcrx->ccid3hcrx_li_hist); 1080 u32 i_mean = dccp_li_hist_calc_i_mean(&hcrx->ccid3hcrx_li_hist);
@@ -1156,7 +1156,7 @@ static int ccid3_hc_rx_getsockopt(struct sock *sk, const int optname, int len,
1156{ 1156{
1157 const struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk); 1157 const struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
1158 const void *val; 1158 const void *val;
1159 1159
1160 /* Listen socks doesn't have a private CCID block */ 1160 /* Listen socks doesn't have a private CCID block */
1161 if (sk->sk_state == DCCP_LISTEN) 1161 if (sk->sk_state == DCCP_LISTEN)
1162 return -EINVAL; 1162 return -EINVAL;
@@ -1183,7 +1183,7 @@ static int ccid3_hc_tx_getsockopt(struct sock *sk, const int optname, int len,
1183{ 1183{
1184 const struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk); 1184 const struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
1185 const void *val; 1185 const void *val;
1186 1186
1187 /* Listen socks doesn't have a private CCID block */ 1187 /* Listen socks doesn't have a private CCID block */
1188 if (sk->sk_state == DCCP_LISTEN) 1188 if (sk->sk_state == DCCP_LISTEN)
1189 return -EINVAL; 1189 return -EINVAL;
diff --git a/net/dccp/ccids/lib/packet_history.h b/net/dccp/ccids/lib/packet_history.h
index 1f960c19ea1b..60d00f015390 100644
--- a/net/dccp/ccids/lib/packet_history.h
+++ b/net/dccp/ccids/lib/packet_history.h
@@ -137,7 +137,7 @@ extern void dccp_rx_hist_delete(struct dccp_rx_hist *hist);
137static inline struct dccp_rx_hist_entry * 137static inline struct dccp_rx_hist_entry *
138 dccp_rx_hist_entry_new(struct dccp_rx_hist *hist, 138 dccp_rx_hist_entry_new(struct dccp_rx_hist *hist,
139 const struct sock *sk, 139 const struct sock *sk,
140 const u32 ndp, 140 const u32 ndp,
141 const struct sk_buff *skb, 141 const struct sk_buff *skb,
142 const gfp_t prio) 142 const gfp_t prio)
143{ 143{
@@ -169,7 +169,7 @@ static inline struct dccp_rx_hist_entry *
169} 169}
170 170
171extern int dccp_rx_hist_find_entry(const struct list_head *list, const u64 seq, 171extern int dccp_rx_hist_find_entry(const struct list_head *list, const u64 seq,
172 u8 *ccval); 172 u8 *ccval);
173extern struct dccp_rx_hist_entry * 173extern struct dccp_rx_hist_entry *
174 dccp_rx_hist_find_data_packet(const struct list_head *list); 174 dccp_rx_hist_find_data_packet(const struct list_head *list);
175 175
diff --git a/net/dccp/ccids/lib/tfrc_equation.c b/net/dccp/ccids/lib/tfrc_equation.c
index 90009fd77e15..e4e64b76c10c 100644
--- a/net/dccp/ccids/lib/tfrc_equation.c
+++ b/net/dccp/ccids/lib/tfrc_equation.c
@@ -26,7 +26,7 @@
26 The following two-column lookup table implements a part of the TCP throughput 26 The following two-column lookup table implements a part of the TCP throughput
27 equation from [RFC 3448, sec. 3.1]: 27 equation from [RFC 3448, sec. 3.1]:
28 28
29 s 29 s
30 X_calc = -------------------------------------------------------------- 30 X_calc = --------------------------------------------------------------
31 R * sqrt(2*b*p/3) + (3 * t_RTO * sqrt(3*b*p/8) * (p + 32*p^3)) 31 R * sqrt(2*b*p/3) + (3 * t_RTO * sqrt(3*b*p/8) * (p + 32*p^3))
32 32
@@ -35,7 +35,7 @@
35 s is the packet size in bytes 35 s is the packet size in bytes
36 R is the round trip time in seconds 36 R is the round trip time in seconds
37 p is the loss event rate, between 0 and 1.0, of the number of loss 37 p is the loss event rate, between 0 and 1.0, of the number of loss
38 events as a fraction of the number of packets transmitted 38 events as a fraction of the number of packets transmitted
39 t_RTO is the TCP retransmission timeout value in seconds 39 t_RTO is the TCP retransmission timeout value in seconds
40 b is the number of packets acknowledged by a single TCP ACK 40 b is the number of packets acknowledged by a single TCP ACK
41 41
@@ -47,9 +47,9 @@
47 47
48 which we can break down into: 48 which we can break down into:
49 49
50 s 50 s
51 X_calc = --------- 51 X_calc = ---------
52 R * f(p) 52 R * f(p)
53 53
54 where f(p) is given for 0 < p <= 1 by: 54 where f(p) is given for 0 < p <= 1 by:
55 55
@@ -62,7 +62,7 @@
62 * the return result f(p) 62 * the return result f(p)
63 The lookup table therefore actually tabulates the following function g(q): 63 The lookup table therefore actually tabulates the following function g(q):
64 64
65 g(q) = 1000000 * f(q/1000000) 65 g(q) = 1000000 * f(q/1000000)
66 66
67 Hence, when p <= 1, q must be less than or equal to 1000000. To achieve finer 67 Hence, when p <= 1, q must be less than or equal to 1000000. To achieve finer
68 granularity for the practically more relevant case of small values of p (up to 68 granularity for the practically more relevant case of small values of p (up to
@@ -628,7 +628,7 @@ u32 tfrc_calc_x(u16 s, u32 R, u32 p)
628 if (R == 0) { /* possible divide by zero */ 628 if (R == 0) { /* possible divide by zero */
629 DCCP_CRIT("WARNING: RTT is 0, returning maximum X_calc."); 629 DCCP_CRIT("WARNING: RTT is 0, returning maximum X_calc.");
630 return ~0U; 630 return ~0U;
631 } 631 }
632 632
633 if (p <= TFRC_CALC_X_SPLIT) { /* 0.0000 < p <= 0.05 */ 633 if (p <= TFRC_CALC_X_SPLIT) { /* 0.0000 < p <= 0.05 */
634 if (p < TFRC_SMALLEST_P) { /* 0.0000 < p < 0.0001 */ 634 if (p < TFRC_SMALLEST_P) { /* 0.0000 < p < 0.0001 */
@@ -638,7 +638,7 @@ u32 tfrc_calc_x(u16 s, u32 R, u32 p)
638 } else /* 0.0001 <= p <= 0.05 */ 638 } else /* 0.0001 <= p <= 0.05 */
639 index = p/TFRC_SMALLEST_P - 1; 639 index = p/TFRC_SMALLEST_P - 1;
640 640
641 f = tfrc_calc_x_lookup[index][1]; 641 f = tfrc_calc_x_lookup[index][1];
642 642
643 } else { /* 0.05 < p <= 1.00 */ 643 } else { /* 0.05 < p <= 1.00 */
644 index = p/(1000000/TFRC_CALC_X_ARRSIZE) - 1; 644 index = p/(1000000/TFRC_CALC_X_ARRSIZE) - 1;
@@ -687,8 +687,8 @@ u32 tfrc_calc_x_reverse_lookup(u32 fvalue)
687 if (fvalue <= tfrc_calc_x_lookup[TFRC_CALC_X_ARRSIZE - 1][1]) { 687 if (fvalue <= tfrc_calc_x_lookup[TFRC_CALC_X_ARRSIZE - 1][1]) {
688 index = tfrc_binsearch(fvalue, 1); 688 index = tfrc_binsearch(fvalue, 1);
689 return (index + 1) * TFRC_CALC_X_SPLIT / TFRC_CALC_X_ARRSIZE; 689 return (index + 1) * TFRC_CALC_X_SPLIT / TFRC_CALC_X_ARRSIZE;
690 } 690 }
691 691
692 /* else ... it must be in the coarse-grained column */ 692 /* else ... it must be in the coarse-grained column */
693 index = tfrc_binsearch(fvalue, 0); 693 index = tfrc_binsearch(fvalue, 0);
694 return (index + 1) * 1000000 / TFRC_CALC_X_ARRSIZE; 694 return (index + 1) * 1000000 / TFRC_CALC_X_ARRSIZE;
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index a0900bf98e6b..e33a9edb4036 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -22,7 +22,7 @@
22 * DCCP - specific warning and debugging macros. 22 * DCCP - specific warning and debugging macros.
23 */ 23 */
24#define DCCP_WARN(fmt, a...) LIMIT_NETDEBUG(KERN_WARNING "%s: " fmt, \ 24#define DCCP_WARN(fmt, a...) LIMIT_NETDEBUG(KERN_WARNING "%s: " fmt, \
25 __FUNCTION__, ##a) 25 __FUNCTION__, ##a)
26#define DCCP_CRIT(fmt, a...) printk(KERN_CRIT fmt " at %s:%d/%s()\n", ##a, \ 26#define DCCP_CRIT(fmt, a...) printk(KERN_CRIT fmt " at %s:%d/%s()\n", ##a, \
27 __FILE__, __LINE__, __FUNCTION__) 27 __FILE__, __LINE__, __FUNCTION__)
28#define DCCP_BUG(a...) do { DCCP_CRIT("BUG: " a); dump_stack(); } while(0) 28#define DCCP_BUG(a...) do { DCCP_CRIT("BUG: " a); dump_stack(); } while(0)
@@ -34,7 +34,7 @@
34#ifdef MODULE 34#ifdef MODULE
35#define DCCP_PRINTK(enable, fmt, args...) do { if (enable) \ 35#define DCCP_PRINTK(enable, fmt, args...) do { if (enable) \
36 printk(fmt, ##args); \ 36 printk(fmt, ##args); \
37 } while(0) 37 } while(0)
38#else 38#else
39#define DCCP_PRINTK(enable, fmt, args...) printk(fmt, ##args) 39#define DCCP_PRINTK(enable, fmt, args...) printk(fmt, ##args)
40#endif 40#endif
@@ -128,7 +128,7 @@ enum {
128 DCCP_MIB_ACTIVEOPENS, /* ActiveOpens */ 128 DCCP_MIB_ACTIVEOPENS, /* ActiveOpens */
129 DCCP_MIB_ESTABRESETS, /* EstabResets */ 129 DCCP_MIB_ESTABRESETS, /* EstabResets */
130 DCCP_MIB_CURRESTAB, /* CurrEstab */ 130 DCCP_MIB_CURRESTAB, /* CurrEstab */
131 DCCP_MIB_OUTSEGS, /* OutSegs */ 131 DCCP_MIB_OUTSEGS, /* OutSegs */
132 DCCP_MIB_OUTRSTS, 132 DCCP_MIB_OUTRSTS,
133 DCCP_MIB_ABORTONTIMEOUT, 133 DCCP_MIB_ABORTONTIMEOUT,
134 DCCP_MIB_TIMEOUTS, 134 DCCP_MIB_TIMEOUTS,
@@ -372,7 +372,7 @@ static inline void dccp_update_gss(struct sock *sk, u64 seq)
372 (dp->dccps_gss - 372 (dp->dccps_gss -
373 dccp_msk(sk)->dccpms_sequence_window + 1)); 373 dccp_msk(sk)->dccpms_sequence_window + 1));
374} 374}
375 375
376static inline int dccp_ack_pending(const struct sock *sk) 376static inline int dccp_ack_pending(const struct sock *sk)
377{ 377{
378 const struct dccp_sock *dp = dccp_sk(sk); 378 const struct dccp_sock *dp = dccp_sk(sk);
diff --git a/net/dccp/feat.c b/net/dccp/feat.c
index 95b6927ec653..cd845df5320d 100644
--- a/net/dccp/feat.c
+++ b/net/dccp/feat.c
@@ -480,8 +480,8 @@ void dccp_feat_clean(struct dccp_minisock *dmsk)
480 480
481 list_for_each_entry_safe(opt, next, &dmsk->dccpms_pending, 481 list_for_each_entry_safe(opt, next, &dmsk->dccpms_pending,
482 dccpop_node) { 482 dccpop_node) {
483 BUG_ON(opt->dccpop_val == NULL); 483 BUG_ON(opt->dccpop_val == NULL);
484 kfree(opt->dccpop_val); 484 kfree(opt->dccpop_val);
485 485
486 if (opt->dccpop_sc != NULL) { 486 if (opt->dccpop_sc != NULL) {
487 BUG_ON(opt->dccpop_sc->dccpoc_val == NULL); 487 BUG_ON(opt->dccpop_sc->dccpoc_val == NULL);
@@ -489,8 +489,8 @@ void dccp_feat_clean(struct dccp_minisock *dmsk)
489 kfree(opt->dccpop_sc); 489 kfree(opt->dccpop_sc);
490 } 490 }
491 491
492 kfree(opt); 492 kfree(opt);
493 } 493 }
494 INIT_LIST_HEAD(&dmsk->dccpms_pending); 494 INIT_LIST_HEAD(&dmsk->dccpms_pending);
495 495
496 list_for_each_entry_safe(opt, next, &dmsk->dccpms_conf, dccpop_node) { 496 list_for_each_entry_safe(opt, next, &dmsk->dccpms_conf, dccpop_node) {
diff --git a/net/dccp/feat.h b/net/dccp/feat.h
index 2c373ad7edcf..177f7dee4d10 100644
--- a/net/dccp/feat.h
+++ b/net/dccp/feat.h
@@ -30,7 +30,7 @@ static inline int dccp_feat_is_reserved(const u8 feat)
30{ 30{
31 return (feat > DCCPF_DATA_CHECKSUM && 31 return (feat > DCCPF_DATA_CHECKSUM &&
32 feat < DCCPF_MIN_CCID_SPECIFIC) || 32 feat < DCCPF_MIN_CCID_SPECIFIC) ||
33 feat == DCCPF_RESERVED; 33 feat == DCCPF_RESERVED;
34} 34}
35 35
36/* feature negotiation knows only these four option types (RFC 4340, sec. 6) */ 36/* feature negotiation knows only these four option types (RFC 4340, sec. 6) */
diff --git a/net/dccp/input.c b/net/dccp/input.c
index 565bc80557ce..4dee462f00db 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -91,7 +91,7 @@ static int dccp_check_seqno(struct sock *sk, struct sk_buff *skb)
91 else 91 else
92 return -1; 92 return -1;
93 } 93 }
94 94
95 /* 95 /*
96 * Step 6: Check sequence numbers 96 * Step 6: Check sequence numbers
97 * Let LSWL = S.SWL and LAWL = S.AWL 97 * Let LSWL = S.SWL and LAWL = S.AWL
@@ -136,7 +136,7 @@ static int dccp_check_seqno(struct sock *sk, struct sk_buff *skb)
136 (unsigned long long) DCCP_SKB_CB(skb)->dccpd_seq, 136 (unsigned long long) DCCP_SKB_CB(skb)->dccpd_seq,
137 (unsigned long long) dp->dccps_swh, 137 (unsigned long long) dp->dccps_swh,
138 (DCCP_SKB_CB(skb)->dccpd_ack_seq == 138 (DCCP_SKB_CB(skb)->dccpd_ack_seq ==
139 DCCP_PKT_WITHOUT_ACK_SEQ) ? "doesn't exist" : "exists", 139 DCCP_PKT_WITHOUT_ACK_SEQ) ? "doesn't exist" : "exists",
140 (unsigned long long) lawl, 140 (unsigned long long) lawl,
141 (unsigned long long) DCCP_SKB_CB(skb)->dccpd_ack_seq, 141 (unsigned long long) DCCP_SKB_CB(skb)->dccpd_ack_seq,
142 (unsigned long long) dp->dccps_awh); 142 (unsigned long long) dp->dccps_awh);
@@ -308,11 +308,11 @@ static int dccp_rcv_request_sent_state_process(struct sock *sk,
308 if (dccp_parse_options(sk, skb)) 308 if (dccp_parse_options(sk, skb))
309 goto out_invalid_packet; 309 goto out_invalid_packet;
310 310
311 if (dccp_msk(sk)->dccpms_send_ack_vector && 311 if (dccp_msk(sk)->dccpms_send_ack_vector &&
312 dccp_ackvec_add(dp->dccps_hc_rx_ackvec, sk, 312 dccp_ackvec_add(dp->dccps_hc_rx_ackvec, sk,
313 DCCP_SKB_CB(skb)->dccpd_seq, 313 DCCP_SKB_CB(skb)->dccpd_seq,
314 DCCP_ACKVEC_STATE_RECEIVED)) 314 DCCP_ACKVEC_STATE_RECEIVED))
315 goto out_invalid_packet; /* FIXME: change error code */ 315 goto out_invalid_packet; /* FIXME: change error code */
316 316
317 dp->dccps_isr = DCCP_SKB_CB(skb)->dccpd_seq; 317 dp->dccps_isr = DCCP_SKB_CB(skb)->dccpd_seq;
318 dccp_update_gsr(sk, dp->dccps_isr); 318 dccp_update_gsr(sk, dp->dccps_isr);
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index fa2c982d4309..4a83978aa660 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -106,7 +106,7 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
106 goto failure; 106 goto failure;
107 107
108 err = ip_route_newports(&rt, IPPROTO_DCCP, inet->sport, inet->dport, 108 err = ip_route_newports(&rt, IPPROTO_DCCP, inet->sport, inet->dport,
109 sk); 109 sk);
110 if (err != 0) 110 if (err != 0)
111 goto failure; 111 goto failure;
112 112
@@ -157,7 +157,7 @@ static inline void dccp_do_pmtu_discovery(struct sock *sk,
157 /* We don't check in the destentry if pmtu discovery is forbidden 157 /* We don't check in the destentry if pmtu discovery is forbidden
158 * on this route. We just assume that no packet_to_big packets 158 * on this route. We just assume that no packet_to_big packets
159 * are send back when pmtu discovery is not active. 159 * are send back when pmtu discovery is not active.
160 * There is a small race when the user changes this flag in the 160 * There is a small race when the user changes this flag in the
161 * route, but I think that's acceptable. 161 * route, but I think that's acceptable.
162 */ 162 */
163 if ((dst = __sk_dst_check(sk, 0)) == NULL) 163 if ((dst = __sk_dst_check(sk, 0)) == NULL)
@@ -486,7 +486,7 @@ static int dccp_v4_send_response(struct sock *sk, struct request_sock *req,
486 struct sk_buff *skb; 486 struct sk_buff *skb;
487 487
488 /* First, grab a route. */ 488 /* First, grab a route. */
489 489
490 if (dst == NULL && (dst = inet_csk_route_req(sk, req)) == NULL) 490 if (dst == NULL && (dst = inet_csk_route_req(sk, req)) == NULL)
491 goto out; 491 goto out;
492 492
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index 79140b3e592e..7f51e8db3967 100644
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -734,7 +734,7 @@ static int dccp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
734 looks not very well thought. For now we latch 734 looks not very well thought. For now we latch
735 options, received in the last packet, enqueued 735 options, received in the last packet, enqueued
736 by tcp. Feel free to propose better solution. 736 by tcp. Feel free to propose better solution.
737 --ANK (980728) 737 --ANK (980728)
738 */ 738 */
739 if (np->rxopt.all) 739 if (np->rxopt.all)
740 /* 740 /*
diff --git a/net/dccp/options.c b/net/dccp/options.c
index c03ba61eb6da..ca13f7731994 100644
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -242,7 +242,7 @@ int dccp_parse_options(struct sock *sk, struct sk_buff *skb)
242 DCCP_CRIT("DCCP(%p): option %d(len=%d) not " 242 DCCP_CRIT("DCCP(%p): option %d(len=%d) not "
243 "implemented, ignoring", sk, opt, len); 243 "implemented, ignoring", sk, opt, len);
244 break; 244 break;
245 } 245 }
246 246
247 if (opt != DCCPO_MANDATORY) 247 if (opt != DCCPO_MANDATORY)
248 mandatory = 0; 248 mandatory = 0;
@@ -442,7 +442,7 @@ static int dccp_insert_option_timestamp_echo(struct sock *sk,
442} 442}
443 443
444static int dccp_insert_feat_opt(struct sk_buff *skb, u8 type, u8 feat, 444static int dccp_insert_feat_opt(struct sk_buff *skb, u8 type, u8 feat,
445 u8 *val, u8 len) 445 u8 *val, u8 len)
446{ 446{
447 u8 *to; 447 u8 *to;
448 448
diff --git a/net/dccp/output.c b/net/dccp/output.c
index 3435542e9652..f5c6aca1dfa4 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -87,7 +87,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb)
87 kfree_skb(skb); 87 kfree_skb(skb);
88 return -EPROTO; 88 return -EPROTO;
89 } 89 }
90 90
91 91
92 /* Build DCCP header and checksum it. */ 92 /* Build DCCP header and checksum it. */
93 dh = dccp_zeroed_hdr(skb, dccp_header_size); 93 dh = dccp_zeroed_hdr(skb, dccp_header_size);
@@ -415,7 +415,7 @@ static inline void dccp_connect_init(struct sock *sk)
415 415
416 sk->sk_err = 0; 416 sk->sk_err = 0;
417 sock_reset_flag(sk, SOCK_DONE); 417 sock_reset_flag(sk, SOCK_DONE);
418 418
419 dccp_sync_mss(sk, dst_mtu(dst)); 419 dccp_sync_mss(sk, dst_mtu(dst));
420 420
421 /* 421 /*
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 48438565d70f..cf28c53a389a 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -478,7 +478,7 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname,
478 err = -EINVAL; 478 err = -EINVAL;
479 else 479 else
480 err = dccp_setsockopt_change(sk, DCCPO_CHANGE_L, 480 err = dccp_setsockopt_change(sk, DCCPO_CHANGE_L,
481 (struct dccp_so_feat __user *) 481 (struct dccp_so_feat __user *)
482 optval); 482 optval);
483 break; 483 break;
484 case DCCP_SOCKOPT_CHANGE_R: 484 case DCCP_SOCKOPT_CHANGE_R:
diff --git a/net/dccp/timer.c b/net/dccp/timer.c
index e5348f369c60..41ea0f6594c4 100644
--- a/net/dccp/timer.c
+++ b/net/dccp/timer.c
@@ -60,7 +60,7 @@ static int dccp_write_timeout(struct sock *sk)
60 be far nicer to have all of the black holes fixed rather than fixing 60 be far nicer to have all of the black holes fixed rather than fixing
61 all of the TCP implementations." 61 all of the TCP implementations."
62 62
63 Golden words :-). 63 Golden words :-).
64 */ 64 */
65 65
66 dst_negative_advice(&sk->sk_dst_cache); 66 dst_negative_advice(&sk->sk_dst_cache);