|
@@ -94,7 +94,8 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
|
|
int err;
|
|
int err;
|
|
__u64 seq;
|
|
__u64 seq;
|
|
|
|
|
|
- sk = inet6_lookup(&init_net, &dccp_hashinfo, &hdr->daddr, dh->dccph_dport,
|
|
|
|
|
|
+ sk = inet6_lookup(dev_net(skb->dev), &dccp_hashinfo,
|
|
|
|
+ &hdr->daddr, dh->dccph_dport,
|
|
&hdr->saddr, dh->dccph_sport, inet6_iif(skb));
|
|
&hdr->saddr, dh->dccph_sport, inet6_iif(skb));
|
|
|
|
|
|
if (sk == NULL) {
|
|
if (sk == NULL) {
|
|
@@ -359,7 +360,7 @@ static struct sock *dccp_v6_hnd_req(struct sock *sk,struct sk_buff *skb)
|
|
if (req != NULL)
|
|
if (req != NULL)
|
|
return dccp_check_req(sk, skb, req, prev);
|
|
return dccp_check_req(sk, skb, req, prev);
|
|
|
|
|
|
- nsk = __inet6_lookup_established(&init_net, &dccp_hashinfo,
|
|
|
|
|
|
+ nsk = __inet6_lookup_established(sock_net(sk), &dccp_hashinfo,
|
|
&iph->saddr, dh->dccph_sport,
|
|
&iph->saddr, dh->dccph_sport,
|
|
&iph->daddr, ntohs(dh->dccph_dport),
|
|
&iph->daddr, ntohs(dh->dccph_dport),
|
|
inet6_iif(skb));
|
|
inet6_iif(skb));
|
|
@@ -790,8 +791,8 @@ static int dccp_v6_rcv(struct sk_buff *skb)
|
|
|
|
|
|
/* Step 2:
|
|
/* Step 2:
|
|
* Look up flow ID in table and get corresponding socket */
|
|
* Look up flow ID in table and get corresponding socket */
|
|
- sk = __inet6_lookup(&init_net, &dccp_hashinfo, &ipv6_hdr(skb)->saddr,
|
|
|
|
- dh->dccph_sport,
|
|
|
|
|
|
+ sk = __inet6_lookup(dev_net(skb->dst->dev), &dccp_hashinfo,
|
|
|
|
+ &ipv6_hdr(skb)->saddr, dh->dccph_sport,
|
|
&ipv6_hdr(skb)->daddr, ntohs(dh->dccph_dport),
|
|
&ipv6_hdr(skb)->daddr, ntohs(dh->dccph_dport),
|
|
inet6_iif(skb));
|
|
inet6_iif(skb));
|
|
/*
|
|
/*
|