summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorFlorent Fourcot <florent.fourcot@enst-bretagne.fr>2013-12-08 15:47:01 +0100
committerDavid S. Miller <davem@davemloft.net>2013-12-10 03:03:50 +0100
commitac1eabcaecfae1ee5cca93c9e21b7cfdac15eaab (patch)
treec3a1c71e1ee9f81ece571d0977a4673cd5a40b00 /net
parentipv6: add ip6_flowlabel helper (diff)
downloadlinux-ac1eabcaecfae1ee5cca93c9e21b7cfdac15eaab.tar.xz
linux-ac1eabcaecfae1ee5cca93c9e21b7cfdac15eaab.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/af_inet6.c3
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)
if (np->rxopt.all) {
if ((opt->hop && (np->rxopt.bits.hopopts ||
np->rxopt.bits.ohopopts)) ||
- ((IPV6_FLOWINFO_MASK &
- *(__be32 *)skb_network_header(skb)) &&
+ (ip6_flowinfo((struct ipv6hdr *) skb_network_header(skb)) &&
np->rxopt.bits.rxflow) ||
(opt->srcrt && (np->rxopt.bits.srcrt ||
np->rxopt.bits.osrcrt)) ||