git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
nfsd4: remove some dprintk's
[safe/jmp/linux-2.6]
/
net
/
dccp
/
dccp.h
diff --git
a/net/dccp/dccp.h
b/net/dccp/dccp.h
index
0bc4c9a
..
f2230fc
100644
(file)
--- a/
net/dccp/dccp.h
+++ b/
net/dccp/dccp.h
@@
-432,10
+432,8
@@
static inline int dccp_ack_pending(const struct sock *sk)
{
const struct dccp_sock *dp = dccp_sk(sk);
return dp->dccps_timestamp_echo != 0 ||
-#ifdef CONFIG_IP_DCCP_ACKVEC
(dp->dccps_hc_rx_ackvec != NULL &&
dccp_ackvec_pending(dp->dccps_hc_rx_ackvec)) ||
-#endif
inet_csk_ack_scheduled(sk);
}