diff options
author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2008-12-08 04:18:37 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-08 04:18:37 -0500 |
commit | 4098dce5be537a157eed4a326efd464109825b8b (patch) | |
tree | f7116e98853d805eb874c4f2345c3cce2acbfaa7 /include/linux/dccp.h | |
parent | 0049bab5e765aa74cf767a834fa336e19453fc5e (diff) |
dccp: Remove manual influence on NDP Count feature
Updating the NDP count feature is handled automatically now:
* for CCID-2 it is disabled, since the code does not use NDP counts;
* for CCID-3 it is enabled, as NDP counts are used to determine loss lengths.
Allowing the user to change NDP values leads to unpredictable and failing
behaviour, since it is then possible to disable NDP counts even when they
are needed (e.g. in CCID-3).
This means that only those user settings are sensible that agree with the
values for Send NDP Count implied by the choice of CCID. But those settings
are already activated by the feature negotiation (CCID dependency tracking),
hence this form of support is redundant.
At startup the initialisation of the NDP count feature uses the default
value of 0, which is done implicitly by the zeroing-out of the socket when
it is allocated. If the choice of CCID or feature negotiation enables NDP
count, this will then be updated via the NDP activation handler.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/dccp.h')
-rw-r--r-- | include/linux/dccp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h index 46daea312d9..60e94438ead 100644 --- a/include/linux/dccp.h +++ b/include/linux/dccp.h | |||
@@ -371,14 +371,12 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb) | |||
371 | * | 371 | * |
372 | * @dccpms_sequence_window - Sequence Window Feature (section 7.5.2) | 372 | * @dccpms_sequence_window - Sequence Window Feature (section 7.5.2) |
373 | * @dccpms_send_ack_vector - Send Ack Vector Feature (section 11.5) | 373 | * @dccpms_send_ack_vector - Send Ack Vector Feature (section 11.5) |
374 | * @dccpms_send_ndp_count - Send NDP Count Feature (7.7.2) | ||
375 | * @dccpms_pending - List of features being negotiated | 374 | * @dccpms_pending - List of features being negotiated |
376 | * @dccpms_conf - | 375 | * @dccpms_conf - |
377 | */ | 376 | */ |
378 | struct dccp_minisock { | 377 | struct dccp_minisock { |
379 | __u64 dccpms_sequence_window; | 378 | __u64 dccpms_sequence_window; |
380 | __u8 dccpms_send_ack_vector; | 379 | __u8 dccpms_send_ack_vector; |
381 | __u8 dccpms_send_ndp_count; | ||
382 | struct list_head dccpms_pending; | 380 | struct list_head dccpms_pending; |
383 | struct list_head dccpms_conf; | 381 | struct list_head dccpms_conf; |
384 | }; | 382 | }; |
@@ -490,6 +488,7 @@ struct dccp_ackvec; | |||
490 | * @dccps_r_ack_ratio - feature-remote Ack Ratio | 488 | * @dccps_r_ack_ratio - feature-remote Ack Ratio |
491 | * @dccps_pcslen - sender partial checksum coverage (via sockopt) | 489 | * @dccps_pcslen - sender partial checksum coverage (via sockopt) |
492 | * @dccps_pcrlen - receiver partial checksum coverage (via sockopt) | 490 | * @dccps_pcrlen - receiver partial checksum coverage (via sockopt) |
491 | * @dccps_send_ndp_count - local Send NDP Count feature (7.7.2) | ||
493 | * @dccps_ndp_count - number of Non Data Packets since last data packet | 492 | * @dccps_ndp_count - number of Non Data Packets since last data packet |
494 | * @dccps_mss_cache - current value of MSS (path MTU minus header sizes) | 493 | * @dccps_mss_cache - current value of MSS (path MTU minus header sizes) |
495 | * @dccps_rate_last - timestamp for rate-limiting DCCP-Sync (RFC 4340, 7.5.4) | 494 | * @dccps_rate_last - timestamp for rate-limiting DCCP-Sync (RFC 4340, 7.5.4) |
@@ -529,6 +528,7 @@ struct dccp_sock { | |||
529 | __u16 dccps_r_ack_ratio; | 528 | __u16 dccps_r_ack_ratio; |
530 | __u8 dccps_pcslen:4; | 529 | __u8 dccps_pcslen:4; |
531 | __u8 dccps_pcrlen:4; | 530 | __u8 dccps_pcrlen:4; |
531 | __u8 dccps_send_ndp_count:1; | ||
532 | __u64 dccps_ndp_count:48; | 532 | __u64 dccps_ndp_count:48; |
533 | unsigned long dccps_rate_last; | 533 | unsigned long dccps_rate_last; |
534 | struct dccp_minisock dccps_minisock; | 534 | struct dccp_minisock dccps_minisock; |