Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-block.git] / net / dccp / ipv4.c

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 902d606324a04ff81adbdc301a1ed58baa3f61f9..9c67a961ba5382c8e3bf8c8a783224fd72b2c122 100644 (file)
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -204,8 +204,6 @@ void dccp_req_err(struct sock *sk, u64 seq)
         * ICMPs are not backlogged, hence we cannot get an established
         * socket here.
         */
-       WARN_ON(req->sk);
-
        if (!between48(seq, dccp_rsk(req)->dreq_iss, dccp_rsk(req)->dreq_gss)) {
                NET_INC_STATS_BH(net, LINUX_MIB_OUTOFWINDOWICMPS);
        } else {
@@ -802,7 +800,7 @@ static int dccp_v4_rcv(struct sk_buff *skb)
        }
 
 lookup:
-       sk = __inet_lookup_skb(&dccp_hashinfo, skb,
+       sk = __inet_lookup_skb(&dccp_hashinfo, skb, __dccp_hdr_len(dh),
                               dh->dccph_sport, dh->dccph_dport);
        if (!sk) {
                dccp_pr_debug("failed to look up flow ID in table and "