From 08a985448d4a70f04213045cadfef1d90bdd28c7 Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Mon, 11 Oct 2010 20:41:13 +0200 Subject: [PATCH] --- yaml --- r: 215145 b: refs/heads/master c: ecdfbdabbe4e0cf0443cbbea2df1bf51bf67f3f3 h: refs/heads/master i: 215143: a8afb41d9899a437e069dd4617d73f8050b503cc v: v3 --- [refs] | 2 +- trunk/net/dccp/dccp.h | 3 +-- trunk/net/dccp/options.c | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 52a684027663..8cdbf73ae1a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d196c9a5d4e150cdff675662214c80c69b906958 +refs/heads/master: ecdfbdabbe4e0cf0443cbbea2df1bf51bf67f3f3 diff --git a/trunk/net/dccp/dccp.h b/trunk/net/dccp/dccp.h index 60f4f9622ab3..3eb264b60823 100644 --- a/trunk/net/dccp/dccp.h +++ b/trunk/net/dccp/dccp.h @@ -459,8 +459,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 || - (dp->dccps_hc_rx_ackvec != NULL && + return (dp->dccps_hc_rx_ackvec != NULL && dccp_ackvec_pending(dp->dccps_hc_rx_ackvec)) || inet_csk_ack_scheduled(sk); } diff --git a/trunk/net/dccp/options.c b/trunk/net/dccp/options.c index d4b1ae0daacb..cd3061813009 100644 --- 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)