net-next-2.6 [PATCH 1/1] dccp: ccids whitespace-cleanup / CodingStyle (aa1b1ff0) · Commits · e / devices / android_kernel_teracube_emerald

net/dccp/ccids/ccid2.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* 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

+3 −5

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* 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,8 +38,8 @@ 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

net/dccp/ccids/ccid3.c

+2 −3

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* 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)
	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

+24 −26

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* 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 {
	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 {
	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

+3 −4

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* 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 };
	/* 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,
	(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