---

yaml --- r: 111507 b: refs/heads/master c: 2975abd h: refs/heads/master i: 111505: 4353cae 111503: 66cd132 v: v3
git-mirror · Sep 4, 2008 · 55b7f41 · 55b7f41
1 parent 69e5b52
commit 55b7f41
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0995e6a9e3328cdc76b4c45882dee118284f960
+refs/heads/master: 2975abd251d795810932b20354729ba236d95bf9
diff --git a/trunk/net/dccp/dccp.h b/trunk/net/dccp/dccp.h
@@ -431,7 +431,7 @@ static inline void dccp_update_gss(struct sock *sk, u64 seq)
 static inline int dccp_ack_pending(const struct sock *sk)
 {
 	const struct dccp_sock *dp = dccp_sk(sk);
-	return dp->dccps_timestamp_echo != 0 ||
+	return
 #ifdef CONFIG_IP_DCCP_ACKVEC
 	       (dp->dccps_hc_rx_ackvec != NULL &&
 		dccp_ackvec_pending(dp->dccps_hc_rx_ackvec)) ||

diff --git a/trunk/net/dccp/options.c b/trunk/net/dccp/options.c
@@ -163,6 +163,8 @@ int dccp_parse_options(struct sock *sk, struct dccp_request_sock *dreq,
 				      dccp_role(sk), ntohl(opt_val),
 				      (unsigned long long)
 				      DCCP_SKB_CB(skb)->dccpd_ack_seq);
+			/* schedule an Ack in case this sender is quiescent */
+			inet_csk_schedule_ack(sk);
 			break;
 		case DCCPO_TIMESTAMP_ECHO:
 			if (len != 4 && len != 6 && len != 8)