Merge tag 'drm-intel-fixes-2016-04-07' of git://anongit.freedesktop.org/drm-intel...

[deliverable/linux.git] / include / net / ipv6.h

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index f3c9857c645dee91a8a850ed5639ae5894dcff73..d0aeb97aec5d2b2c40eee41049fa6f64f5e0d503 100644 (file)
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -835,6 +835,12 @@ static inline u8 ip6_tclass(__be32 flowinfo)
 {
        return ntohl(flowinfo & IPV6_TCLASS_MASK) >> IPV6_TCLASS_SHIFT;
 }
+
+static inline __be32 ip6_make_flowinfo(unsigned int tclass, __be32 flowlabel)
+{
+       return htonl(tclass << IPV6_TCLASS_SHIFT) | flowlabel;
+}
+
 /*
  *     Prototypes exported by ipv6
  */