diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-19 11:18:46 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-19 11:18:46 -0500 |
| commit | f787d1debf63f78a15b2d1c79e7f1788c4fadfa0 (patch) | |
| tree | 97811cde0b0b3f3f32af3eb48516d539d60573f5 /net/dccp | |
| parent | 4e33e34625103593a71d2bae471ce49cef62ef06 (diff) | |
| parent | 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869 (diff) | |
| download | linux-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.tar.gz linux-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.tar.bz2 linux-f787d1debf63f78a15b2d1c79e7f1788c4fadfa0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/input.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dccp/input.c b/net/dccp/input.c index ba347184bda9..8fedc2d49770 100644 --- a/net/dccp/input.c +++ b/net/dccp/input.c @@ -606,7 +606,8 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, if (inet_csk(sk)->icsk_af_ops->conn_request(sk, skb) < 0) return 1; - goto discard; + consume_skb(skb); + return 0; } if (dh->dccph_type == DCCP_PKT_RESET) goto discard; |