Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3308de2b authored by Florent Fourcot's avatar Florent Fourcot Committed by David S. Miller
Browse files

ipv6: add ip6_flowlabel helper 



And use it if possible.

Signed-off-by: default avatarFlorent Fourcot <florent.fourcot@enst-bretagne.fr>
Reviewed-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82e9f105

include/net/ipv6.h

+5 −0
Original line number Diff line number Diff line
@@ -679,6 +679,11 @@ static inline __be32 ip6_flowinfo(const struct ipv6hdr *hdr) 
	return *(__be32 *)hdr & IPV6_FLOWINFO_MASK;

}



static inline __be32 ip6_flowlabel(const struct ipv6hdr *hdr)

{

	return *(__be32 *)hdr & IPV6_FLOWLABEL_MASK;

}



/*

 *	Prototypes exported by ipv6

 */

net/ipv6/ip6_gre.c

+1 −1
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ static inline int ip6gre_xmit_ipv6(struct sk_buff *skb, struct net_device *dev) 
	if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)

		fl6.flowlabel |= (*(__be32 *) ipv6h & IPV6_TCLASS_MASK);

	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FLOWLABEL)

		fl6.flowlabel |= (*(__be32 *) ipv6h & IPV6_FLOWLABEL_MASK);

		fl6.flowlabel |= ip6_flowlabel(ipv6h);

	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)

		fl6.flowi6_mark = skb->mark;

net/ipv6/ip6_tunnel.c

+1 −1
Original line number Diff line number Diff line
@@ -1130,7 +1130,7 @@ ip6ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)

		fl6.flowlabel |= (*(__be32 *) ipv6h & IPV6_TCLASS_MASK);

	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FLOWLABEL)

		fl6.flowlabel |= (*(__be32 *) ipv6h & IPV6_FLOWLABEL_MASK);

		fl6.flowlabel |= ip6_flowlabel(ipv6h);

	if (t->parms.flags & IP6_TNL_F_USE_ORIG_FWMARK)

		fl6.flowi6_mark = skb->mark;