diff options
| author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-09-18 00:17:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-09-18 00:17:51 -0700 |
| commit | ae31c3399d17b1f7bc1742724f70476b5417744f (patch) | |
| tree | c34099afb228936672e6e589f0af7d81f1f62443 /net/dccp/output.c | |
| parent | 21f130a2370ba837cdfc5204ebe52e7c664fec3d (diff) | |
| download | kernel_samsung_crespo-ae31c3399d17b1f7bc1742724f70476b5417744f.zip kernel_samsung_crespo-ae31c3399d17b1f7bc1742724f70476b5417744f.tar.gz kernel_samsung_crespo-ae31c3399d17b1f7bc1742724f70476b5417744f.tar.bz2 | |
[DCCP]: Move the ack vector code to net/dccp/ackvec.[ch]
Isolating it, that will be used when we introduce a CCID2 (TCP-Like)
implementation.
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/output.c')
| -rw-r--r-- | net/dccp/output.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/net/dccp/output.c b/net/dccp/output.c index 156b1d2..4786bdc 100644 --- a/net/dccp/output.c +++ b/net/dccp/output.c @@ -16,6 +16,7 @@ #include <net/sock.h> +#include "ackvec.h" #include "ccid.h" #include "dccp.h" @@ -225,7 +226,6 @@ int dccp_write_xmit(struct sock *sk, struct sk_buff *skb, long *timeo) err = dccp_wait_for_ccid(sk, skb, timeo); if (err == 0) { - const struct dccp_ackpkts *ap = dp->dccps_hc_rx_ackpkts; struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb); const int len = skb->len; @@ -236,15 +236,7 @@ int dccp_write_xmit(struct sock *sk, struct sk_buff *skb, long *timeo) inet_csk(sk)->icsk_rto, DCCP_RTO_MAX); dcb->dccpd_type = DCCP_PKT_DATAACK; - /* - * FIXME: we really should have a - * dccps_ack_pending or use icsk. - */ - } else if (inet_csk_ack_scheduled(sk) || - dp->dccps_timestamp_echo != 0 || - (dp->dccps_options.dccpo_send_ack_vector && - ap->dccpap_buf_ackno != DCCP_MAX_SEQNO + 1 && - ap->dccpap_ack_seqno == DCCP_MAX_SEQNO + 1)) + } else if (dccp_ack_pending(sk)) dcb->dccpd_type = DCCP_PKT_DATAACK; else dcb->dccpd_type = DCCP_PKT_DATA; |