diff options
| author | Eric Dumazet <edumazet@google.com> | 2014-09-27 09:50:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-28 16:35:43 -0400 |
| commit | a224772db8420ecb7ce91a9ba5d535ee3a50d982 (patch) | |
| tree | e8e5a42ba9b6b7cac22c469bd8a1ab496dca6daf /net/dccp | |
| parent | 24a2d43d8886f5a29c3cf108927f630c545a9a38 (diff) | |
| download | linux-a224772db8420ecb7ce91a9ba5d535ee3a50d982.tar.gz linux-a224772db8420ecb7ce91a9ba5d535ee3a50d982.tar.bz2 linux-a224772db8420ecb7ce91a9ba5d535ee3a50d982.zip | |
ipv6: add a struct inet6_skb_parm param to ipv6_opt_accepted()
ipv6_opt_accepted() assumes IP6CB(skb) holds the struct inet6_skb_parm
that it needs. Lets not assume this, as TCP stack might use a different
place.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 04cb17d4b0ce..ad2acfe1ca61 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -404,7 +404,7 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb) ireq->ir_v6_rmt_addr = ipv6_hdr(skb)->saddr; ireq->ir_v6_loc_addr = ipv6_hdr(skb)->daddr; - if (ipv6_opt_accepted(sk, skb) || + if (ipv6_opt_accepted(sk, skb, IP6CB(skb)) || np->rxopt.bits.rxinfo || np->rxopt.bits.rxoinfo || np->rxopt.bits.rxhlim || np->rxopt.bits.rxohlim) { atomic_inc(&skb->users); |