aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2007-11-24 19:09:35 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 17:54:59 -0500
commit83399361c30f2ffae20ee348ba9ada9a856d499a (patch)
tree51f5399c9d394ab4ec1483d7bb908566a19e8792 /net
parentda98e0b5d4c1f88b7c9e63e8918783cd4905be2b (diff)
[CCID2]: Remove redundant synchronisation variable
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>
Diffstat (limited to 'net')
-rw-r--r--net/dccp/ccids/ccid2.c11
-rw-r--r--net/dccp/ccids/ccid2.h1
2 files changed, 2 insertions, 10 deletions
diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index 2d1b7e30a73c..4f6c35261b6e 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -126,13 +126,8 @@ static int ccid2_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
126{ 126{
127 struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk); 127 struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
128 128
129 if (hctx->ccid2hctx_pipe < hctx->ccid2hctx_cwnd) { 129 if (hctx->ccid2hctx_pipe < hctx->ccid2hctx_cwnd)
130 /* OK we can send... make sure previous packet was sent off */ 130 return 0;
131 if (!hctx->ccid2hctx_sendwait) {
132 hctx->ccid2hctx_sendwait = 1;
133 return 0;
134 }
135 }
136 131
137 return 1; /* XXX CCID should dequeue when ready instead of polling */ 132 return 1; /* XXX CCID should dequeue when ready instead of polling */
138} 133}
@@ -236,8 +231,6 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
236 struct ccid2_seq *next; 231 struct ccid2_seq *next;
237 u64 seq; 232 u64 seq;
238 233
239 BUG_ON(!hctx->ccid2hctx_sendwait);
240 hctx->ccid2hctx_sendwait = 0;
241 hctx->ccid2hctx_pipe++; 234 hctx->ccid2hctx_pipe++;
242 235
243 /* There is an issue. What if another packet is sent between 236 /* There is an issue. What if another packet is sent between
diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h
index bc659f00cb96..2671f8ebe294 100644
--- a/net/dccp/ccids/ccid2.h
+++ b/net/dccp/ccids/ccid2.h
@@ -66,7 +66,6 @@ struct ccid2_hc_tx_sock {
66 struct timer_list ccid2hctx_rtotimer; 66 struct timer_list ccid2hctx_rtotimer;
67 u64 ccid2hctx_rpseq; 67 u64 ccid2hctx_rpseq;
68 int ccid2hctx_rpdupack; 68 int ccid2hctx_rpdupack;
69 int ccid2hctx_sendwait;
70 unsigned long ccid2hctx_last_cong; 69 unsigned long ccid2hctx_last_cong;
71 u64 ccid2hctx_high_ack; 70 u64 ccid2hctx_high_ack;
72}; 71};