From b56bab46f3220eb6b1f71c000faa44c6b13fb148 Mon Sep 17 00:00:00 2001 From: Vlad Yasevich Date: Fri, 29 Sep 2006 17:09:34 -0700 Subject: [SCTP]: Use correct mask when disabling PMTUD. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller --- net/sctp/input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'net/sctp/input.c') diff --git a/net/sctp/input.c b/net/sctp/input.c index 03f65de75d8..4714882ada9 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c @@ -388,7 +388,7 @@ void sctp_icmp_frag_needed(struct sock *sk, struct sctp_association *asoc, * pmtu discovery on this transport. */ t->pathmtu = SCTP_DEFAULT_MINSEGMENT; - t->param_flags = (t->param_flags & ~SPP_HB) | + t->param_flags = (t->param_flags & ~SPP_PMTUD) | SPP_PMTUD_DISABLE; } else { t->pathmtu = pmtu; -- cgit v1.2.3 From f236218b7292bccb0f8754a0feb5d9e9a06fe5a2 Mon Sep 17 00:00:00 2001 From: Vlad Yasevich Date: Fri, 29 Sep 2006 17:10:03 -0700 Subject: [SCTP]: Do not timestamp every SCTP packet. We only need the timestamp on COOKIE-ECHO chunks, so instead of always timestamping every SCTP packet, let common code timestamp if the socket option is set. For COOKIE-ECHO, simply get the time of day if we don't have a timestamp. This introduces a small possibility that the cookie may be considered expired, but it will be renegotiated. Signed-off-by: Vlad Yasevich Signed-off-by: Sridhar Samudrala Signed-off-by: David S. Miller --- net/sctp/input.c | 6 ------ 1 file changed, 6 deletions(-) (limited to 'net/sctp/input.c') diff --git a/net/sctp/input.c b/net/sctp/input.c index 4714882ada9..64f63010253 100644 --- a/net/sctp/input.c +++ b/net/sctp/input.c @@ -218,12 +218,6 @@ int sctp_rcv(struct sk_buff *skb) } } - /* SCTP seems to always need a timestamp right now (FIXME) */ - if (skb->tstamp.off_sec == 0) { - __net_timestamp(skb); - sock_enable_timestamp(sk); - } - if (!xfrm_policy_check(sk, XFRM_POLICY_IN, skb, family)) goto discard_release; nf_reset(skb); -- cgit v1.2.3