Commit 4098dce5 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

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: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0049bab5

Documentation/networking/dccp.txt

+0 −3
Original line number Diff line number Diff line
@@ -133,9 +133,6 @@ retries2 
	importance for retransmitted acknowledgments and feature negotiation,

	data packets are never retransmitted. Analogue of tcp_retries2.



send_ndp = 1

	Whether or not to send NDP count options (sec. 7.7.2).



send_ackvec = 1

	Whether or not to send Ack Vector options (sec. 11.5).

include/linux/dccp.h

+2 −2
Original line number Diff line number Diff line
@@ -371,14 +371,12 @@ static inline unsigned int dccp_hdr_len(const struct sk_buff *skb) 
  *

  * @dccpms_sequence_window - Sequence Window Feature (section 7.5.2)

  * @dccpms_send_ack_vector - Send Ack Vector Feature (section 11.5)

  * @dccpms_send_ndp_count - Send NDP Count Feature (7.7.2)

  * @dccpms_pending - List of features being negotiated

  * @dccpms_conf -

  */

struct dccp_minisock {

	__u64			dccpms_sequence_window;

	__u8			dccpms_send_ack_vector;

	__u8			dccpms_send_ndp_count;

	struct list_head	dccpms_pending;

	struct list_head	dccpms_conf;

};
@@ -490,6 +488,7 @@ struct dccp_ackvec; 
 * @dccps_r_ack_ratio - feature-remote Ack Ratio

 * @dccps_pcslen - sender   partial checksum coverage (via sockopt)

 * @dccps_pcrlen - receiver partial checksum coverage (via sockopt)

 * @dccps_send_ndp_count - local Send NDP Count feature (7.7.2)

 * @dccps_ndp_count - number of Non Data Packets since last data packet

 * @dccps_mss_cache - current value of MSS (path MTU minus header sizes)

 * @dccps_rate_last - timestamp for rate-limiting DCCP-Sync (RFC 4340, 7.5.4)
@@ -529,6 +528,7 @@ struct dccp_sock { 
	__u16				dccps_r_ack_ratio;

	__u8				dccps_pcslen:4;

	__u8				dccps_pcrlen:4;

	__u8				dccps_send_ndp_count:1;

	__u64				dccps_ndp_count:48;

	unsigned long			dccps_rate_last;

	struct dccp_minisock		dccps_minisock;

net/dccp/dccp.h

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ extern int sysctl_dccp_feat_sequence_window; 
extern int  sysctl_dccp_feat_rx_ccid;

extern int  sysctl_dccp_feat_tx_ccid;

extern int  sysctl_dccp_feat_send_ack_vector;

extern int  sysctl_dccp_feat_send_ndp_count;

extern int  sysctl_dccp_tx_qlen;

extern int  sysctl_dccp_sync_ratelimit;

net/dccp/feat.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int dccp_hdlr_ackvec(struct sock *sk, u64 enable, bool rx) 
static int dccp_hdlr_ndp(struct sock *sk, u64 enable, bool rx)

{

	if (!rx)

		dccp_msk(sk)->dccpms_send_ndp_count = (enable > 0);

		dccp_sk(sk)->dccps_send_ndp_count = (enable > 0);

	return 0;

}

net/dccp/minisocks.c

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ void dccp_minisock_init(struct dccp_minisock *dmsk) 
{

	dmsk->dccpms_sequence_window = sysctl_dccp_feat_sequence_window;

	dmsk->dccpms_send_ack_vector = sysctl_dccp_feat_send_ack_vector;

	dmsk->dccpms_send_ndp_count  = sysctl_dccp_feat_send_ndp_count;

}



void dccp_time_wait(struct sock *sk, int state, int timeo)

CRA Git | Maintained and supported by SUSTech CRA and CCSE