diff options
Diffstat (limited to 'net/dccp/ipv6.c')
-rw-r--r-- | net/dccp/ipv6.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 5e1ee0da2c40..11062780bb02 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
@@ -98,7 +98,8 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
98 | 98 | ||
99 | if (skb->len < offset + sizeof(*dh) || | 99 | if (skb->len < offset + sizeof(*dh) || |
100 | skb->len < offset + __dccp_basic_hdr_len(dh)) { | 100 | skb->len < offset + __dccp_basic_hdr_len(dh)) { |
101 | ICMP6_INC_STATS_BH(__in6_dev_get(skb->dev), ICMP6_MIB_INERRORS); | 101 | ICMP6_INC_STATS_BH(net, __in6_dev_get(skb->dev), |
102 | ICMP6_MIB_INERRORS); | ||
102 | return; | 103 | return; |
103 | } | 104 | } |
104 | 105 | ||
@@ -107,7 +108,8 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
107 | &hdr->saddr, dh->dccph_sport, inet6_iif(skb)); | 108 | &hdr->saddr, dh->dccph_sport, inet6_iif(skb)); |
108 | 109 | ||
109 | if (sk == NULL) { | 110 | if (sk == NULL) { |
110 | ICMP6_INC_STATS_BH(__in6_dev_get(skb->dev), ICMP6_MIB_INERRORS); | 111 | ICMP6_INC_STATS_BH(net, __in6_dev_get(skb->dev), |
112 | ICMP6_MIB_INERRORS); | ||
111 | return; | 113 | return; |
112 | } | 114 | } |
113 | 115 | ||
@@ -805,10 +807,8 @@ static int dccp_v6_rcv(struct sk_buff *skb) | |||
805 | 807 | ||
806 | /* Step 2: | 808 | /* Step 2: |
807 | * Look up flow ID in table and get corresponding socket */ | 809 | * Look up flow ID in table and get corresponding socket */ |
808 | sk = __inet6_lookup(dev_net(skb->dst->dev), &dccp_hashinfo, | 810 | sk = __inet6_lookup_skb(&dccp_hashinfo, skb, |
809 | &ipv6_hdr(skb)->saddr, dh->dccph_sport, | 811 | dh->dccph_sport, dh->dccph_dport); |
810 | &ipv6_hdr(skb)->daddr, ntohs(dh->dccph_dport), | ||
811 | inet6_iif(skb)); | ||
812 | /* | 812 | /* |
813 | * Step 2: | 813 | * Step 2: |
814 | * If no socket ... | 814 | * If no socket ... |