mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
83399361c3
This removes the synchronisation variable `ccid2hctx_sendwait', which is set to 1 when the CCID2 sender may send a new packet, and which is set to 0 otherwise The variable is redundant, since it is only used in combination with the hc_tx_send_packet/ hc_tx_packet_sent function pair. Both functions are called under socket lock, so the following happens when the CCID2 may send a new packet: * it sets sendwait = 1 in tx_send_packet and returns 0; * the subsequent call to tx_packet_sent clears the sendwait flag; * since tx_send_packet returns 0 if and only if sendwait == 1, the BUG_ON condition in tx_packet_sent is never satisfied, since that function is never called when tx_send_packet returns a value different from 0 (cf. dccp_write_xmit); * the call to tx_packet_sent clears the flag so that the condition "!sendwait" is true the next time tx_packet_sent is called. In other words, it is sufficient to just return 0 / not-0 to synchronise tx_send_packet and tx_packet_sent -- which is what the patch does. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
87 lines
2.4 KiB
C
87 lines
2.4 KiB
C
/*
|
|
* net/dccp/ccids/ccid2.h
|
|
*
|
|
* Copyright (c) 2005 Andrea Bittau <a.bittau@cs.ucl.ac.uk>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
#ifndef _DCCP_CCID2_H_
|
|
#define _DCCP_CCID2_H_
|
|
|
|
#include <linux/dccp.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/types.h>
|
|
#include "../ccid.h"
|
|
/* NUMDUPACK parameter from RFC 4341, p. 6 */
|
|
#define NUMDUPACK 3
|
|
|
|
struct sock;
|
|
|
|
struct ccid2_seq {
|
|
u64 ccid2s_seq;
|
|
unsigned long ccid2s_sent;
|
|
int ccid2s_acked;
|
|
struct ccid2_seq *ccid2s_prev;
|
|
struct ccid2_seq *ccid2s_next;
|
|
};
|
|
|
|
#define CCID2_SEQBUF_LEN 1024
|
|
#define CCID2_SEQBUF_MAX 128
|
|
|
|
/** struct ccid2_hc_tx_sock - CCID2 TX half connection
|
|
*
|
|
* @ccid2hctx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
|
|
* @ccid2hctx_ssacks - ACKs recv in slow start
|
|
* @ccid2hctx_acks - ACKS recv in AI phase
|
|
* @ccid2hctx_lastrtt -time RTT was last measured
|
|
* @ccid2hctx_rpseq - last consecutive seqno
|
|
* @ccid2hctx_rpdupack - dupacks since rpseq
|
|
*/
|
|
struct ccid2_hc_tx_sock {
|
|
u32 ccid2hctx_cwnd;
|
|
u32 ccid2hctx_ssthresh;
|
|
u32 ccid2hctx_pipe;
|
|
int ccid2hctx_ssacks;
|
|
int ccid2hctx_acks;
|
|
struct ccid2_seq *ccid2hctx_seqbuf[CCID2_SEQBUF_MAX];
|
|
int ccid2hctx_seqbufc;
|
|
struct ccid2_seq *ccid2hctx_seqh;
|
|
struct ccid2_seq *ccid2hctx_seqt;
|
|
long ccid2hctx_rto;
|
|
long ccid2hctx_srtt;
|
|
long ccid2hctx_rttvar;
|
|
unsigned long ccid2hctx_lastrtt;
|
|
struct timer_list ccid2hctx_rtotimer;
|
|
u64 ccid2hctx_rpseq;
|
|
int ccid2hctx_rpdupack;
|
|
unsigned long ccid2hctx_last_cong;
|
|
u64 ccid2hctx_high_ack;
|
|
};
|
|
|
|
struct ccid2_hc_rx_sock {
|
|
int ccid2hcrx_data;
|
|
};
|
|
|
|
static inline struct ccid2_hc_tx_sock *ccid2_hc_tx_sk(const struct sock *sk)
|
|
{
|
|
return ccid_priv(dccp_sk(sk)->dccps_hc_tx_ccid);
|
|
}
|
|
|
|
static inline struct ccid2_hc_rx_sock *ccid2_hc_rx_sk(const struct sock *sk)
|
|
{
|
|
return ccid_priv(dccp_sk(sk)->dccps_hc_rx_ccid);
|
|
}
|
|
#endif /* _DCCP_CCID2_H_ */
|