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 /net/dccp/dccp.h | |
| parent | d196c9a5d4e150cdff675662214c80c69b906958 (diff) | |
| download | linux-ecdfbdabbe4e0cf0443cbbea2df1bf51bf67f3f3.tar.gz linux-ecdfbdabbe4e0cf0443cbbea2df1bf51bf67f3f3.tar.bz2 linux-ecdfbdabbe4e0cf0443cbbea2df1bf51bf67f3f3.zip | |
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>
Diffstat (limited to 'net/dccp/dccp.h')
| -rw-r--r-- | net/dccp/dccp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index 60f4f9622ab3..3eb264b60823 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); } |