diff options
Diffstat (limited to 'net/dccp/dccp.h')
-rw-r--r-- | net/dccp/dccp.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index e4d6e76ced41..1e65378eea3f 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h | |||
@@ -448,15 +448,15 @@ static inline void dccp_update_gss(struct sock *sk, u64 seq) | |||
448 | dp->dccps_awh = dp->dccps_gss; | 448 | dp->dccps_awh = dp->dccps_gss; |
449 | } | 449 | } |
450 | 450 | ||
451 | static inline int dccp_ackvec_pending(const struct sock *sk) | ||
452 | { | ||
453 | return dccp_sk(sk)->dccps_hc_rx_ackvec != NULL && | ||
454 | !dccp_ackvec_is_empty(dccp_sk(sk)->dccps_hc_rx_ackvec); | ||
455 | } | ||
456 | |||
451 | static inline int dccp_ack_pending(const struct sock *sk) | 457 | static inline int dccp_ack_pending(const struct sock *sk) |
452 | { | 458 | { |
453 | const struct dccp_sock *dp = dccp_sk(sk); | 459 | return dccp_ackvec_pending(sk) || inet_csk_ack_scheduled(sk); |
454 | return | ||
455 | #ifdef CONFIG_IP_DCCP_ACKVEC | ||
456 | (dp->dccps_hc_rx_ackvec != NULL && | ||
457 | dccp_ackvec_pending(dp->dccps_hc_rx_ackvec)) || | ||
458 | #endif | ||
459 | inet_csk_ack_scheduled(sk); | ||
460 | } | 460 | } |
461 | 461 | ||
462 | extern int dccp_feat_signal_nn_change(struct sock *sk, u8 feat, u64 nn_val); | 462 | extern int dccp_feat_signal_nn_change(struct sock *sk, u8 feat, u64 nn_val); |