Commit aa1b1ff0 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller

net-next-2.6 [PATCH 1/1] dccp: ccids whitespace-cleanup / CodingStyle

No code change, cosmetical changes only:

 * whitespace cleanup via scripts/cleanfile,
 * remove self-references to filename at top of files,
 * fix coding style (extraneous brackets),
 * fix documentation style (kernel-doc-nano-HOWTO).

Thanks are due to Ivo Augusto Calado who raised these issues by
submitting good-quality patches.
Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d136f1bd
/* /*
* net/dccp/ccids/ccid2.c
*
* Copyright (c) 2005, 2006 Andrea Bittau <a.bittau@cs.ucl.ac.uk> * Copyright (c) 2005, 2006 Andrea Bittau <a.bittau@cs.ucl.ac.uk>
* *
* Changes to meet Linux coding standards, and DCCP infrastructure fixes. * Changes to meet Linux coding standards, and DCCP infrastructure fixes.
......
/* /*
* net/dccp/ccids/ccid2.h
*
* Copyright (c) 2005 Andrea Bittau <a.bittau@cs.ucl.ac.uk> * Copyright (c) 2005 Andrea Bittau <a.bittau@cs.ucl.ac.uk>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -40,14 +38,14 @@ struct ccid2_seq { ...@@ -40,14 +38,14 @@ struct ccid2_seq {
#define CCID2_SEQBUF_LEN 1024 #define CCID2_SEQBUF_LEN 1024
#define CCID2_SEQBUF_MAX 128 #define CCID2_SEQBUF_MAX 128
/** struct ccid2_hc_tx_sock - CCID2 TX half connection /**
* * struct ccid2_hc_tx_sock - CCID2 TX half connection
* @ccid2hctx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5 * @ccid2hctx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
* @ccid2hctx_packets_acked - Ack counter for deriving cwnd growth (RFC 3465) * @ccid2hctx_packets_acked - Ack counter for deriving cwnd growth (RFC 3465)
* @ccid2hctx_lastrtt -time RTT was last measured * @ccid2hctx_lastrtt -time RTT was last measured
* @ccid2hctx_rpseq - last consecutive seqno * @ccid2hctx_rpseq - last consecutive seqno
* @ccid2hctx_rpdupack - dupacks since rpseq * @ccid2hctx_rpdupack - dupacks since rpseq
*/ */
struct ccid2_hc_tx_sock { struct ccid2_hc_tx_sock {
u32 ccid2hctx_cwnd; u32 ccid2hctx_cwnd;
u32 ccid2hctx_ssthresh; u32 ccid2hctx_ssthresh;
......
/* /*
* net/dccp/ccids/ccid3.c
*
* Copyright (c) 2007 The University of Aberdeen, Scotland, UK * Copyright (c) 2007 The University of Aberdeen, Scotland, UK
* Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand.
* Copyright (c) 2005-7 Ian McDonald <ian.mcdonald@jandi.co.nz> * Copyright (c) 2005-7 Ian McDonald <ian.mcdonald@jandi.co.nz>
...@@ -750,7 +748,8 @@ static int ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb) ...@@ -750,7 +748,8 @@ static int ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb)
return 0; return 0;
} }
/** ccid3_first_li - Implements [RFC 3448, 6.3.1] /**
* ccid3_first_li - Implements [RFC 5348, 6.3.1]
* *
* Determine the length of the first loss interval via inverse lookup. * Determine the length of the first loss interval via inverse lookup.
* Assume that X_recv can be computed by the throughput equation * Assume that X_recv can be computed by the throughput equation
......
/* /*
* net/dccp/ccids/ccid3.h
*
* Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand.
* Copyright (c) 2007 The University of Aberdeen, Scotland, UK * Copyright (c) 2007 The University of Aberdeen, Scotland, UK
* *
...@@ -75,8 +73,8 @@ enum ccid3_hc_tx_states { ...@@ -75,8 +73,8 @@ enum ccid3_hc_tx_states {
TFRC_SSTATE_TERM, TFRC_SSTATE_TERM,
}; };
/** struct ccid3_hc_tx_sock - CCID3 sender half-connection socket /**
* * struct ccid3_hc_tx_sock - CCID3 sender half-connection socket
* @ccid3hctx_x - Current sending rate in 64 * bytes per second * @ccid3hctx_x - Current sending rate in 64 * bytes per second
* @ccid3hctx_x_recv - Receive rate in 64 * bytes per second * @ccid3hctx_x_recv - Receive rate in 64 * bytes per second
* @ccid3hctx_x_calc - Calculated rate in bytes per second * @ccid3hctx_x_calc - Calculated rate in bytes per second
...@@ -131,8 +129,8 @@ enum ccid3_hc_rx_states { ...@@ -131,8 +129,8 @@ enum ccid3_hc_rx_states {
TFRC_RSTATE_TERM = 127, TFRC_RSTATE_TERM = 127,
}; };
/** struct ccid3_hc_rx_sock - CCID3 receiver half-connection socket /**
* * struct ccid3_hc_rx_sock - CCID3 receiver half-connection socket
* @ccid3hcrx_x_recv - Receiver estimate of send rate (RFC 3448 4.3) * @ccid3hcrx_x_recv - Receiver estimate of send rate (RFC 3448 4.3)
* @ccid3hcrx_rtt - Receiver estimate of rtt (non-standard) * @ccid3hcrx_rtt - Receiver estimate of rtt (non-standard)
* @ccid3hcrx_p - Current loss event rate (RFC 3448 5.4) * @ccid3hcrx_p - Current loss event rate (RFC 3448 5.4)
......
/* /*
* net/dccp/ccids/lib/loss_interval.c
*
* Copyright (c) 2007 The University of Aberdeen, Scotland, UK * Copyright (c) 2007 The University of Aberdeen, Scotland, UK
* Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand.
* Copyright (c) 2005-7 Ian McDonald <ian.mcdonald@jandi.co.nz> * Copyright (c) 2005-7 Ian McDonald <ian.mcdonald@jandi.co.nz>
...@@ -21,7 +19,7 @@ static const int tfrc_lh_weights[NINTERVAL] = { 10, 10, 10, 10, 8, 6, 4, 2 }; ...@@ -21,7 +19,7 @@ static const int tfrc_lh_weights[NINTERVAL] = { 10, 10, 10, 10, 8, 6, 4, 2 };
/* implements LIFO semantics on the array */ /* implements LIFO semantics on the array */
static inline u8 LIH_INDEX(const u8 ctr) static inline u8 LIH_INDEX(const u8 ctr)
{ {
return (LIH_SIZE - 1 - (ctr % LIH_SIZE)); return LIH_SIZE - 1 - (ctr % LIH_SIZE);
} }
/* the `counter' index always points at the next entry to be populated */ /* the `counter' index always points at the next entry to be populated */
...@@ -129,7 +127,8 @@ static inline u8 tfrc_lh_is_new_loss(struct tfrc_loss_interval *cur, ...@@ -129,7 +127,8 @@ static inline u8 tfrc_lh_is_new_loss(struct tfrc_loss_interval *cur,
(cur->li_is_closed || SUB16(new_loss->tfrchrx_ccval, cur->li_ccval) > 4); (cur->li_is_closed || SUB16(new_loss->tfrchrx_ccval, cur->li_ccval) > 4);
} }
/** tfrc_lh_interval_add - Insert new record into the Loss Interval database /**
* tfrc_lh_interval_add - Insert new record into the Loss Interval database
* @lh: Loss Interval database * @lh: Loss Interval database
* @rh: Receive history containing a fresh loss event * @rh: Receive history containing a fresh loss event
* @calc_first_li: Caller-dependent routine to compute length of first interval * @calc_first_li: Caller-dependent routine to compute length of first interval
......
#ifndef _DCCP_LI_HIST_ #ifndef _DCCP_LI_HIST_
#define _DCCP_LI_HIST_ #define _DCCP_LI_HIST_
/* /*
* net/dccp/ccids/lib/loss_interval.h
*
* Copyright (c) 2007 The University of Aberdeen, Scotland, UK * Copyright (c) 2007 The University of Aberdeen, Scotland, UK
* Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand.
* Copyright (c) 2005-7 Ian McDonald <ian.mcdonald@jandi.co.nz> * Copyright (c) 2005-7 Ian McDonald <ian.mcdonald@jandi.co.nz>
......
/* /*
* net/dccp/packet_history.c
*
* Copyright (c) 2007 The University of Aberdeen, Scotland, UK * Copyright (c) 2007 The University of Aberdeen, Scotland, UK
* Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand. * Copyright (c) 2005-7 The University of Waikato, Hamilton, New Zealand.
* *
......
...@@ -70,7 +70,6 @@ struct tfrc_rx_hist_entry { ...@@ -70,7 +70,6 @@ struct tfrc_rx_hist_entry {
/** /**
* tfrc_rx_hist - RX history structure for TFRC-based protocols * tfrc_rx_hist - RX history structure for TFRC-based protocols
*
* @ring: Packet history for RTT sampling and loss detection * @ring: Packet history for RTT sampling and loss detection
* @loss_count: Number of entries in circular history * @loss_count: Number of entries in circular history
* @loss_start: Movable index (for loss detection) * @loss_start: Movable index (for loss detection)
......
#ifndef _TFRC_H_ #ifndef _TFRC_H_
#define _TFRC_H_ #define _TFRC_H_
/* /*
* net/dccp/ccids/lib/tfrc.h
*
* Copyright (c) 2007 The University of Aberdeen, Scotland, UK * Copyright (c) 2007 The University of Aberdeen, Scotland, UK
* Copyright (c) 2005-6 The University of Waikato, Hamilton, New Zealand. * Copyright (c) 2005-6 The University of Waikato, Hamilton, New Zealand.
* Copyright (c) 2005-6 Ian McDonald <ian.mcdonald@jandi.co.nz> * Copyright (c) 2005-6 Ian McDonald <ian.mcdonald@jandi.co.nz>
...@@ -32,7 +30,7 @@ extern int tfrc_debug; ...@@ -32,7 +30,7 @@ extern int tfrc_debug;
/* integer-arithmetic divisions of type (a * 1000000)/b */ /* integer-arithmetic divisions of type (a * 1000000)/b */
static inline u64 scaled_div(u64 a, u64 b) static inline u64 scaled_div(u64 a, u64 b)
{ {
BUG_ON(b==0); BUG_ON(b == 0);
return div64_u64(a * 1000000, b); return div64_u64(a * 1000000, b);
} }
......
/* /*
* net/dccp/ccids/lib/tfrc_equation.c
*
* Copyright (c) 2005 The University of Waikato, Hamilton, New Zealand. * Copyright (c) 2005 The University of Waikato, Hamilton, New Zealand.
* Copyright (c) 2005 Ian McDonald <ian.mcdonald@jandi.co.nz> * Copyright (c) 2005 Ian McDonald <ian.mcdonald@jandi.co.nz>
* Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@conectiva.com.br> * Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
...@@ -610,7 +608,6 @@ static inline u32 tfrc_binsearch(u32 fval, u8 small) ...@@ -610,7 +608,6 @@ static inline u32 tfrc_binsearch(u32 fval, u8 small)
/** /**
* tfrc_calc_x - Calculate the send rate as per section 3.1 of RFC3448 * tfrc_calc_x - Calculate the send rate as per section 3.1 of RFC3448
*
* @s: packet size in bytes * @s: packet size in bytes
* @R: RTT scaled by 1000000 (i.e., microseconds) * @R: RTT scaled by 1000000 (i.e., microseconds)
* @p: loss ratio estimate scaled by 1000000 * @p: loss ratio estimate scaled by 1000000
...@@ -661,7 +658,6 @@ u32 tfrc_calc_x(u16 s, u32 R, u32 p) ...@@ -661,7 +658,6 @@ u32 tfrc_calc_x(u16 s, u32 R, u32 p)
/** /**
* tfrc_calc_x_reverse_lookup - try to find p given f(p) * tfrc_calc_x_reverse_lookup - try to find p given f(p)
*
* @fvalue: function value to match, scaled by 1000000 * @fvalue: function value to match, scaled by 1000000
* Returns closest match for p, also scaled by 1000000 * Returns closest match for p, also scaled by 1000000
*/ */
......
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