diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2010-10-11 20:41:13 +0200 |
|---|---|---|
| committer | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2010-10-12 06:57:43 +0200 |
| commit | ecdfbdabbe4e0cf0443cbbea2df1bf51bf67f3f3 (patch) | |
| tree | 1c71220ce0627db499da079eb3d0577c2dd8d064 | |
| parent | d196c9a5d4e150cdff675662214c80c69b906958 (diff) | |
| download | op-kernel-dev-ecdfbdabbe4e0cf0443cbbea2df1bf51bf67f3f3.zip op-kernel-dev-ecdfbdabbe4e0cf0443cbbea2df1bf51bf67f3f3.tar.gz | |
dccp: schedule an Ack when receiving timestamps
This schedules an Ack when receiving a timestamp, exploiting the
existing inet_csk_schedule_ack() function, saving one case in the
`dccp_ack_pending()' function.
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
| -rw-r--r-- | net/dccp/dccp.h | 3 | ||||
| -rw-r--r-- | net/dccp/options.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index 60f4f96..3eb264b 100644 --- a/net/dccp/dccp.h +++ b/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/net/dccp/options.c b/net/dccp/options.c index d4b1ae0..cd30618 100644 --- a/net/dccp/options.c +++ b/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) |
