aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/options.c
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2008-12-08 04:18:37 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-08 04:18:37 -0500
commit4098dce5be537a157eed4a326efd464109825b8b (patch)
treef7116e98853d805eb874c4f2345c3cce2acbfaa7 /net/dccp/options.c
parent0049bab5e765aa74cf767a834fa336e19453fc5e (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 'net/dccp/options.c')
-rw-r--r--net/dccp/options.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/dccp/options.c b/net/dccp/options.c
index debb1008c7ad..e9d674874b4e 100644
--- a/net/dccp/options.c
+++ b/net/dccp/options.c
@@ -27,7 +27,6 @@ int sysctl_dccp_feat_sequence_window = DCCPF_INITIAL_SEQUENCE_WINDOW;
27int sysctl_dccp_feat_rx_ccid = DCCPF_INITIAL_CCID; 27int sysctl_dccp_feat_rx_ccid = DCCPF_INITIAL_CCID;
28int sysctl_dccp_feat_tx_ccid = DCCPF_INITIAL_CCID; 28int sysctl_dccp_feat_tx_ccid = DCCPF_INITIAL_CCID;
29int sysctl_dccp_feat_send_ack_vector = DCCPF_INITIAL_SEND_ACK_VECTOR; 29int sysctl_dccp_feat_send_ack_vector = DCCPF_INITIAL_SEND_ACK_VECTOR;
30int sysctl_dccp_feat_send_ndp_count = DCCPF_INITIAL_SEND_NDP_COUNT;
31 30
32u64 dccp_decode_value_var(const u8 *bf, const u8 len) 31u64 dccp_decode_value_var(const u8 *bf, const u8 len)
33{ 32{
@@ -531,8 +530,7 @@ int dccp_insert_options(struct sock *sk, struct sk_buff *skb)
531 530
532 DCCP_SKB_CB(skb)->dccpd_opt_len = 0; 531 DCCP_SKB_CB(skb)->dccpd_opt_len = 0;
533 532
534 if (dmsk->dccpms_send_ndp_count && 533 if (dp->dccps_send_ndp_count && dccp_insert_option_ndp(sk, skb))
535 dccp_insert_option_ndp(sk, skb))
536 return -1; 534 return -1;
537 535
538 if (DCCP_SKB_CB(skb)->dccpd_type != DCCP_PKT_DATA) { 536 if (DCCP_SKB_CB(skb)->dccpd_type != DCCP_PKT_DATA) {