diff options
| author |   Florian Westphal <fw@strlen.de> | 2015-07-08 23:32:12 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-07-09 15:06:59 -0700 |
| commit | 8b58a39846568dcd7d0c98b2fadc25018e59dedf (patch) | |
| tree | 3d6a6c7a7fa43ca374991fe79bfe44d34e69b9d3 /net/ipv6/af_inet6.c | |
| parent | dsa: mv88e6352/mv88e6xxx: Add support for Marvell 88E6320 and 88E6321 (diff) | |
| download | linux-dev-8b58a39846568dcd7d0c98b2fadc25018e59dedf.tar.xz linux-dev-8b58a39846568dcd7d0c98b2fadc25018e59dedf.zip | |
ipv6: use flag instead of u16 for hop in inet6_skb_parm
Hop was always either 0 or sizeof(struct ipv6hdr).
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/af_inet6.c')
| -rw-r--r-- | net/ipv6/af_inet6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 7de52b65173f..39e670a91596 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -679,8 +679,8 @@ bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb, const struct ipv6_pinfo *np = inet6_sk(sk); if (np->rxopt.all) { - if ((opt->hop && (np->rxopt.bits.hopopts || - np->rxopt.bits.ohopopts)) || + if (((opt->flags & IP6SKB_HOPBYHOP) && + (np->rxopt.bits.hopopts || np->rxopt.bits.ohopopts)) || (ip6_flowinfo((struct ipv6hdr *) skb_network_header(skb)) && np->rxopt.bits.rxflow) || (opt->srcrt && (np->rxopt.bits.srcrt || |