diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-10-26 06:50:02 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-26 06:50:02 -0400 |
| commit | 8c56a347c1dfbe384b1ffb65d8828faa36dbaea4 (patch) | |
| tree | 44dfa8621b387fc76168db3858996466b278f38e /net/dccp/ipv6.c | |
| parent | d892afe2ca905ddb00a4f16927c8b465cdd31b20 (diff) | |
| parent | 24c667db59a9cc4caaafe4f77f6f4ef85899a454 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'net/dccp/ipv6.c')
| -rw-r--r-- | net/dccp/ipv6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index bbadd6681b83..62428ff137dd 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c | |||
| @@ -173,7 +173,7 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
| 173 | 173 | ||
| 174 | icmpv6_err_convert(type, code, &err); | 174 | icmpv6_err_convert(type, code, &err); |
| 175 | 175 | ||
| 176 | seq = DCCP_SKB_CB(skb)->dccpd_seq; | 176 | seq = dccp_hdr_seq(dh); |
| 177 | /* Might be for an request_sock */ | 177 | /* Might be for an request_sock */ |
| 178 | switch (sk->sk_state) { | 178 | switch (sk->sk_state) { |
| 179 | struct request_sock *req, **prev; | 179 | struct request_sock *req, **prev; |
| @@ -787,7 +787,7 @@ static int dccp_v6_rcv(struct sk_buff *skb) | |||
| 787 | 787 | ||
| 788 | dh = dccp_hdr(skb); | 788 | dh = dccp_hdr(skb); |
| 789 | 789 | ||
| 790 | DCCP_SKB_CB(skb)->dccpd_seq = dccp_hdr_seq(skb); | 790 | DCCP_SKB_CB(skb)->dccpd_seq = dccp_hdr_seq(dh); |
| 791 | DCCP_SKB_CB(skb)->dccpd_type = dh->dccph_type; | 791 | DCCP_SKB_CB(skb)->dccpd_type = dh->dccph_type; |
| 792 | 792 | ||
| 793 | if (dccp_packet_without_ack(skb)) | 793 | if (dccp_packet_without_ack(skb)) |