mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
[DCCP]: Whitespace cleanups
That accumulated over the last months hackaton, shame on me for not using git-apply whitespace helping hand, will do that from now on. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
This commit is contained in:
Arnaldo Carvalho de Melo
David S. Miller
parent
1fba78b6cb
commit
8109b02b53
13 changed files with 149 additions and 137 deletions
|
|
@ -228,7 +228,8 @@ static void ccid3_hc_tx_no_feedback_timer(unsigned long data)
|
|||
*/
|
||||
if (!hctx->ccid3hctx_idle ||
|
||||
(hctx->ccid3hctx_x_recv >= 4 *
|
||||
scaled_div(((__u64)hctx->ccid3hctx_s) << 6, hctx->ccid3hctx_rtt))) {
|
||||
scaled_div(((__u64)hctx->ccid3hctx_s) << 6,
|
||||
hctx->ccid3hctx_rtt))) {
|
||||
struct timeval now;
|
||||
|
||||
ccid3_pr_debug("%s(%p, state=%s), not idle\n",
|
||||
|
|
@ -248,7 +249,8 @@ static void ccid3_hc_tx_no_feedback_timer(unsigned long data)
|
|||
BUG_ON(hctx->ccid3hctx_p && !hctx->ccid3hctx_x_calc);
|
||||
|
||||
if (hctx->ccid3hctx_p == 0 ||
|
||||
hctx->ccid3hctx_x_calc > (hctx->ccid3hctx_x_recv >> 5)) {
|
||||
(hctx->ccid3hctx_x_calc >
|
||||
(hctx->ccid3hctx_x_recv >> 5))) {
|
||||
|
||||
hctx->ccid3hctx_x_recv =
|
||||
max(hctx->ccid3hctx_x_recv / 2,
|
||||
|
|
@ -316,7 +318,8 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
|
|||
switch (hctx->ccid3hctx_state) {
|
||||
case TFRC_SSTATE_NO_SENT:
|
||||
sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
|
||||
jiffies + usecs_to_jiffies(TFRC_INITIAL_TIMEOUT));
|
||||
(jiffies +
|
||||
usecs_to_jiffies(TFRC_INITIAL_TIMEOUT)));
|
||||
hctx->ccid3hctx_last_win_count = 0;
|
||||
hctx->ccid3hctx_t_last_win_count = now;
|
||||
ccid3_hc_tx_set_state(sk, TFRC_SSTATE_NO_FBACK);
|
||||
|
|
@ -365,7 +368,8 @@ static int ccid3_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void ccid3_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
|
||||
static void ccid3_hc_tx_packet_sent(struct sock *sk, int more,
|
||||
unsigned int len)
|
||||
{
|
||||
struct ccid3_hc_tx_sock *hctx = ccid3_hc_tx_sk(sk);
|
||||
struct timeval now;
|
||||
|
|
@ -475,7 +479,8 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
|
|||
|
||||
ccid3_pr_debug("%s(%p), s=%u, w_init=%llu, "
|
||||
"R_sample=%dus, X=%u\n", dccp_role(sk),
|
||||
sk, hctx->ccid3hctx_s, w_init, (int)r_sample,
|
||||
sk, hctx->ccid3hctx_s, w_init,
|
||||
(int)r_sample,
|
||||
(unsigned)(hctx->ccid3hctx_x >> 6));
|
||||
|
||||
ccid3_hc_tx_set_state(sk, TFRC_SSTATE_FBACK);
|
||||
|
|
@ -492,7 +497,8 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
|
|||
ccid3_hc_tx_update_x(sk, &now);
|
||||
|
||||
ccid3_pr_debug("%s(%p), RTT=%uus (sample=%dus), s=%u, "
|
||||
"p=%u, X_calc=%u, X_recv=%u, X=%u\n", dccp_role(sk),
|
||||
"p=%u, X_calc=%u, X_recv=%u, X=%u\n",
|
||||
dccp_role(sk),
|
||||
sk, hctx->ccid3hctx_rtt, (int)r_sample,
|
||||
hctx->ccid3hctx_s, hctx->ccid3hctx_p,
|
||||
hctx->ccid3hctx_x_calc,
|
||||
|
|
@ -507,16 +513,16 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
|
|||
dccp_tx_hist_purge_older(ccid3_tx_hist,
|
||||
&hctx->ccid3hctx_hist, packet);
|
||||
/*
|
||||
* As we have calculated new ipi, delta, t_nom it is possible that
|
||||
* we now can send a packet, so wake up dccp_wait_for_ccid
|
||||
* As we have calculated new ipi, delta, t_nom it is possible
|
||||
* that we now can send a packet, so wake up dccp_wait_for_ccid
|
||||
*/
|
||||
sk->sk_write_space(sk);
|
||||
|
||||
/*
|
||||
* Update timeout interval for the nofeedback timer.
|
||||
* We use a configuration option to increase the lower bound.
|
||||
* This can help avoid triggering the nofeedback timer too often
|
||||
* ('spinning') on LANs with small RTTs.
|
||||
* This can help avoid triggering the nofeedback timer too
|
||||
* often ('spinning') on LANs with small RTTs.
|
||||
*/
|
||||
hctx->ccid3hctx_t_rto = max_t(u32, 4 * hctx->ccid3hctx_rtt,
|
||||
CONFIG_IP_DCCP_CCID3_RTO *
|
||||
|
|
@ -528,7 +534,8 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
|
|||
t_nfb = max(hctx->ccid3hctx_t_rto, 2 * hctx->ccid3hctx_t_ipi);
|
||||
|
||||
ccid3_pr_debug("%s(%p), Scheduled no feedback timer to "
|
||||
"expire in %lu jiffies (%luus)\n", dccp_role(sk),
|
||||
"expire in %lu jiffies (%luus)\n",
|
||||
dccp_role(sk),
|
||||
sk, usecs_to_jiffies(t_nfb), t_nfb);
|
||||
|
||||
sk_reset_timer(sk, &hctx->ccid3hctx_no_feedback_timer,
|
||||
|
|
@ -538,7 +545,9 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
|
|||
hctx->ccid3hctx_idle = 1;
|
||||
break;
|
||||
case TFRC_SSTATE_NO_SENT:
|
||||
/* XXX when implementing bidirectional rx/tx check this again */
|
||||
/*
|
||||
* XXX when implementing bidirectional rx/tx check this again
|
||||
*/
|
||||
DCCP_WARN("Illegal ACK received - no packet sent\n");
|
||||
/* fall through */
|
||||
case TFRC_SSTATE_TERM: /* ignore feedback when closing */
|
||||
|
|
@ -575,7 +584,8 @@ static int ccid3_hc_tx_parse_options(struct sock *sk, unsigned char option,
|
|||
dccp_role(sk), sk, len);
|
||||
rc = -EINVAL;
|
||||
} else {
|
||||
opt_recv->ccid3or_loss_event_rate = ntohl(*(__be32 *)value);
|
||||
opt_recv->ccid3or_loss_event_rate =
|
||||
ntohl(*(__be32 *)value);
|
||||
ccid3_pr_debug("%s(%p), LOSS_EVENT_RATE=%u\n",
|
||||
dccp_role(sk), sk,
|
||||
opt_recv->ccid3or_loss_event_rate);
|
||||
|
|
@ -596,7 +606,8 @@ static int ccid3_hc_tx_parse_options(struct sock *sk, unsigned char option,
|
|||
dccp_role(sk), sk, len);
|
||||
rc = -EINVAL;
|
||||
} else {
|
||||
opt_recv->ccid3or_receive_rate = ntohl(*(__be32 *)value);
|
||||
opt_recv->ccid3or_receive_rate =
|
||||
ntohl(*(__be32 *)value);
|
||||
ccid3_pr_debug("%s(%p), RECEIVE_RATE=%u\n",
|
||||
dccp_role(sk), sk,
|
||||
opt_recv->ccid3or_receive_rate);
|
||||
|
|
@ -616,7 +627,8 @@ static int ccid3_hc_tx_init(struct ccid *ccid, struct sock *sk)
|
|||
hctx->ccid3hctx_state = TFRC_SSTATE_NO_SENT;
|
||||
INIT_LIST_HEAD(&hctx->ccid3hctx_hist);
|
||||
|
||||
hctx->ccid3hctx_no_feedback_timer.function = ccid3_hc_tx_no_feedback_timer;
|
||||
hctx->ccid3hctx_no_feedback_timer.function =
|
||||
ccid3_hc_tx_no_feedback_timer;
|
||||
hctx->ccid3hctx_no_feedback_timer.data = (unsigned long)sk;
|
||||
init_timer(&hctx->ccid3hctx_no_feedback_timer);
|
||||
|
||||
|
|
@ -914,7 +926,8 @@ static int ccid3_hc_rx_detect_loss(struct sock *sk,
|
|||
struct dccp_rx_hist_entry *packet)
|
||||
{
|
||||
struct ccid3_hc_rx_sock *hcrx = ccid3_hc_rx_sk(sk);
|
||||
struct dccp_rx_hist_entry *rx_hist = dccp_rx_hist_head(&hcrx->ccid3hcrx_hist);
|
||||
struct dccp_rx_hist_entry *rx_hist =
|
||||
dccp_rx_hist_head(&hcrx->ccid3hcrx_hist);
|
||||
u64 seqno = packet->dccphrx_seqno;
|
||||
u64 tmp_seqno;
|
||||
int loss = 0;
|
||||
|
|
@ -1044,8 +1057,8 @@ static void ccid3_hc_rx_packet_recv(struct sock *sk, struct sk_buff *skb)
|
|||
break;
|
||||
|
||||
dccp_timestamp(sk, &now);
|
||||
if (timeval_delta(&now, &hcrx->ccid3hcrx_tstamp_last_ack) -
|
||||
(suseconds_t)hcrx->ccid3hcrx_rtt >= 0) {
|
||||
if ((timeval_delta(&now, &hcrx->ccid3hcrx_tstamp_last_ack) -
|
||||
(suseconds_t)hcrx->ccid3hcrx_rtt) >= 0) {
|
||||
hcrx->ccid3hcrx_tstamp_last_ack = now;
|
||||
ccid3_hc_rx_send_feedback(sk);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -338,7 +338,6 @@ EXPORT_SYMBOL_GPL(dccp_make_response);
|
|||
|
||||
static struct sk_buff *dccp_make_reset(struct sock *sk, struct dst_entry *dst,
|
||||
const enum dccp_reset_codes code)
|
||||
|
||||
{
|
||||
struct dccp_hdr *dh;
|
||||
struct dccp_sock *dp = dccp_sk(sk);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue