aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/options.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-10-12 14:43:42 -0400
committerDavid S. Miller <davem@davemloft.net>2010-10-12 14:43:42 -0400
commit8fa6e3d4549271a5b4094893f059bb95f99a8fde (patch)
tree4c8ae1be73e4749f782cc3f18ec6e42650b8f872 /net/dccp/options.c
parentc239f279e571a272c1b32a1e84b8fa037b68f49c (diff)
parent2f34b32977ade4249601f35f7eb0cdd56b4e0f89 (diff)
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
Diffstat (limited to 'net/dccp/options.c')
-rw-r--r--net/dccp/options.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/dccp/options.c b/net/dccp/options.c
index d4b1ae0daacb..cd3061813009 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,
163 dccp_role(sk), ntohl(opt_val), 163 dccp_role(sk), ntohl(opt_val),
164 (unsigned long long) 164 (unsigned long long)
165 DCCP_SKB_CB(skb)->dccpd_ack_seq); 165 DCCP_SKB_CB(skb)->dccpd_ack_seq);
166 /* schedule an Ack in case this sender is quiescent */
167 inet_csk_schedule_ack(sk);
166 break; 168 break;
167 case DCCPO_TIMESTAMP_ECHO: 169 case DCCPO_TIMESTAMP_ECHO:
168 if (len != 4 && len != 6 && len != 8) 170 if (len != 4 && len != 6 && len != 8)