From 55b7f41f777c5832d38a21a5356bb19a487c21db Mon Sep 17 00:00:00 2001 From: Gerrit Renker Date: Thu, 4 Sep 2008 07:30:19 +0200 Subject: [PATCH] --- yaml --- r: 111507 b: refs/heads/master c: 2975abd251d795810932b20354729ba236d95bf9 h: refs/heads/master i: 111505: 4353cae10d513d8d363a2c6fc5f94fbe23fd0a00 111503: 66cd132aefe6a08cc5fe49b15df0b36b61934c86 v: v3 --- [refs] | 2 +- trunk/net/dccp/dccp.h | 2 +- trunk/net/dccp/options.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e9461097119f..564f284c4f7a 100644 --- 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 index c7370de4c4d5..f9ed0cbd1bf3 100644 --- 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 index e1c94e2b8be0..9fe0510f4022 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)