aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/dccp.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/dccp.h')
-rw-r--r--net/dccp/dccp.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index a8ed459508b2..19fafd597465 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -457,12 +457,15 @@ static inline void dccp_update_gss(struct sock *sk, u64 seq)
457 dp->dccps_awh = dp->dccps_gss; 457 dp->dccps_awh = dp->dccps_gss;
458} 458}
459 459
460static inline int dccp_ackvec_pending(const struct sock *sk)
461{
462 return dccp_sk(sk)->dccps_hc_rx_ackvec != NULL &&
463 !dccp_ackvec_is_empty(dccp_sk(sk)->dccps_hc_rx_ackvec);
464}
465
460static inline int dccp_ack_pending(const struct sock *sk) 466static inline int dccp_ack_pending(const struct sock *sk)
461{ 467{
462 const struct dccp_sock *dp = dccp_sk(sk); 468 return dccp_ackvec_pending(sk) || inet_csk_ack_scheduled(sk);
463 return (dp->dccps_hc_rx_ackvec != NULL &&
464 dccp_ackvec_pending(dp->dccps_hc_rx_ackvec)) ||
465 inet_csk_ack_scheduled(sk);
466} 469}
467 470
468extern int dccp_feat_finalise_settings(struct dccp_sock *dp); 471extern int dccp_feat_finalise_settings(struct dccp_sock *dp);