aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/af_inet6.c
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2014-09-27 12:50:56 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-28 16:35:43 -0400
commita224772db8420ecb7ce91a9ba5d535ee3a50d982 (patch)
treee8e5a42ba9b6b7cac22c469bd8a1ab496dca6daf /net/ipv6/af_inet6.c
parent24a2d43d8886f5a29c3cf108927f630c545a9a38 (diff)
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/ipv6/af_inet6.c')
-rw-r--r--net/ipv6/af_inet6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index e4865a3ebe1d..34f726f59814 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -672,10 +672,10 @@ int inet6_sk_rebuild_header(struct sock *sk)
672} 672}
673EXPORT_SYMBOL_GPL(inet6_sk_rebuild_header); 673EXPORT_SYMBOL_GPL(inet6_sk_rebuild_header);
674 674
675bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb) 675bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb,
676 const struct inet6_skb_parm *opt)
676{ 677{
677 const struct ipv6_pinfo *np = inet6_sk(sk); 678 const struct ipv6_pinfo *np = inet6_sk(sk);
678 const struct inet6_skb_parm *opt = IP6CB(skb);
679 679
680 if (np->rxopt.all) { 680 if (np->rxopt.all) {
681 if ((opt->hop && (np->rxopt.bits.hopopts || 681 if ((opt->hop && (np->rxopt.bits.hopopts ||