diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2010-11-14 11:26:13 -0500 |
|---|---|---|
| committer | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2010-11-15 01:12:01 -0500 |
| commit | 7e87fe84303cc54ecf3c7b688cb08ca24322a41d (patch) | |
| tree | df764cbfefe19e628e92a8353d331d91c33212b6 /net/dccp/ccids/ccid2.h | |
| parent | 52394eecec4e6fa677a61af26f0bd35de665344e (diff) | |
dccp ccid-2: Separate option parsing from CCID processing
This patch replaces an almost identical replication of code: large parts
of dccp_parse_options() re-appeared as ccid2_ackvector() in ccid2.c.
Apart from the duplication, this caused two more problems:
1. CCIDs should not need to be concerned with parsing header options;
2. one can not assume that Ack Vectors appear as a contiguous area within an
skb, it is legal to insert other options and/or padding in between. The
current code would throw an error and stop reading in such a case.
Since Ack Vectors provide CCID-specific information, they are now processed
by the CCID directly, separating this functionality from the main DCCP code.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Diffstat (limited to 'net/dccp/ccids/ccid2.h')
| -rw-r--r-- | net/dccp/ccids/ccid2.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h index 25cb6b216eda..e9985dafc2c7 100644 --- a/net/dccp/ccids/ccid2.h +++ b/net/dccp/ccids/ccid2.h | |||
| @@ -55,6 +55,7 @@ struct ccid2_seq { | |||
| 55 | * @tx_rtt_seq: to decay RTTVAR at most once per flight | 55 | * @tx_rtt_seq: to decay RTTVAR at most once per flight |
| 56 | * @tx_rpseq: last consecutive seqno | 56 | * @tx_rpseq: last consecutive seqno |
| 57 | * @tx_rpdupack: dupacks since rpseq | 57 | * @tx_rpdupack: dupacks since rpseq |
| 58 | * @tx_av_chunks: list of Ack Vectors received on current skb | ||
| 58 | */ | 59 | */ |
| 59 | struct ccid2_hc_tx_sock { | 60 | struct ccid2_hc_tx_sock { |
| 60 | u32 tx_cwnd; | 61 | u32 tx_cwnd; |
| @@ -79,6 +80,7 @@ struct ccid2_hc_tx_sock { | |||
| 79 | int tx_rpdupack; | 80 | int tx_rpdupack; |
| 80 | u32 tx_last_cong; | 81 | u32 tx_last_cong; |
| 81 | u64 tx_high_ack; | 82 | u64 tx_high_ack; |
| 83 | struct list_head tx_av_chunks; | ||
| 82 | }; | 84 | }; |
| 83 | 85 | ||
| 84 | static inline bool ccid2_cwnd_network_limited(struct ccid2_hc_tx_sock *hc) | 86 | static inline bool ccid2_cwnd_network_limited(struct ccid2_hc_tx_sock *hc) |