diff options
author | Arnaldo Carvalho de Melo <acme@mandriva.com> | 2005-08-09 23:30:56 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 18:55:18 -0400 |
commit | 27258ee54f8cd4a43d09319aa5448145afc2cb8d (patch) | |
tree | 4a52d16da47f7ab0777252169406ae85e53488b1 /net/dccp/ccid.h | |
parent | 0d48d93947dd9ea21c5cdc76a8581b06a4a39281 (diff) |
[DCCP]: Introduce dccp_write_xmit from code in dccp_sendmsg
This way it gets closer to the TCP flow, where congestion window
checks are done, it seems we can map ccid_hc_tx_send_packet in
dccp_write_xmit to tcp_snd_wnd_test in tcp_write_xmit, a CCID2
decision should just fit in here as well...
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ccid.h')
-rw-r--r-- | net/dccp/ccid.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/dccp/ccid.h b/net/dccp/ccid.h index 06105b2a613c..469f9a14b463 100644 --- a/net/dccp/ccid.h +++ b/net/dccp/ccid.h | |||
@@ -43,8 +43,7 @@ struct ccid { | |||
43 | unsigned char len, u16 idx, | 43 | unsigned char len, u16 idx, |
44 | unsigned char* value); | 44 | unsigned char* value); |
45 | int (*ccid_hc_tx_send_packet)(struct sock *sk, | 45 | int (*ccid_hc_tx_send_packet)(struct sock *sk, |
46 | struct sk_buff *skb, int len, | 46 | struct sk_buff *skb, int len); |
47 | long *delay); | ||
48 | void (*ccid_hc_tx_packet_sent)(struct sock *sk, int more, int len); | 47 | void (*ccid_hc_tx_packet_sent)(struct sock *sk, int more, int len); |
49 | }; | 48 | }; |
50 | 49 | ||
@@ -60,12 +59,11 @@ static inline void __ccid_get(struct ccid *ccid) | |||
60 | } | 59 | } |
61 | 60 | ||
62 | static inline int ccid_hc_tx_send_packet(struct ccid *ccid, struct sock *sk, | 61 | static inline int ccid_hc_tx_send_packet(struct ccid *ccid, struct sock *sk, |
63 | struct sk_buff *skb, int len, | 62 | struct sk_buff *skb, int len) |
64 | long *delay) | ||
65 | { | 63 | { |
66 | int rc = 0; | 64 | int rc = 0; |
67 | if (ccid->ccid_hc_tx_send_packet != NULL) | 65 | if (ccid->ccid_hc_tx_send_packet != NULL) |
68 | rc = ccid->ccid_hc_tx_send_packet(sk, skb, len, delay); | 66 | rc = ccid->ccid_hc_tx_send_packet(sk, skb, len); |
69 | return rc; | 67 | return rc; |
70 | } | 68 | } |
71 | 69 | ||