diff options
| author | Florent Fourcot <florent.fourcot@enst-bretagne.fr> | 2013-12-08 09:47:01 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-09 21:03:50 -0500 |
| commit | ac1eabcaecfae1ee5cca93c9e21b7cfdac15eaab (patch) | |
| tree | c3a1c71e1ee9f81ece571d0977a4673cd5a40b00 | |
| parent | 3308de2b841e5f25bdc4a7208a451f52f8cff969 (diff) | |
ipv6: use ip6_flowinfo helper
Signed-off-by: Florent Fourcot <florent.fourcot@enst-bretagne.fr>
Reviewed-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/af_inet6.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 4fbdb7046d28..027615ac1b4e 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c | |||
| @@ -683,8 +683,7 @@ bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb) | |||
| 683 | if (np->rxopt.all) { | 683 | if (np->rxopt.all) { |
| 684 | if ((opt->hop && (np->rxopt.bits.hopopts || | 684 | if ((opt->hop && (np->rxopt.bits.hopopts || |
| 685 | np->rxopt.bits.ohopopts)) || | 685 | np->rxopt.bits.ohopopts)) || |
| 686 | ((IPV6_FLOWINFO_MASK & | 686 | (ip6_flowinfo((struct ipv6hdr *) skb_network_header(skb)) && |
| 687 | *(__be32 *)skb_network_header(skb)) && | ||
| 688 | np->rxopt.bits.rxflow) || | 687 | np->rxopt.bits.rxflow) || |
| 689 | (opt->srcrt && (np->rxopt.bits.srcrt || | 688 | (opt->srcrt && (np->rxopt.bits.srcrt || |
| 690 | np->rxopt.bits.osrcrt)) || | 689 | np->rxopt.bits.osrcrt)) || |
