diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-27 12:00:54 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-27 12:00:54 +0800 |
| commit | 4304568925f8191755da36df5c61abb69db9b1b0 (patch) | |
| tree | 2415500d53c3638f505fd853705c420352d6a853 /net/dccp/input.c | |
| parent | ba0cfa06c512552bdba8264b46b006478253f39b (diff) | |
| parent | 71205f3b80da389c52cc2611f59e183a77c56f4f (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'net/dccp/input.c')
| -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 3bd14e885396..dbe2573f6ba1 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; |