diff options
| author | Florent Fourcot <florent.fourcot@enst-bretagne.fr> | 2013-12-08 15:47:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-09 21:03:49 -0500 |
| commit | 3308de2b841e5f25bdc4a7208a451f52f8cff969 (patch) | |
| tree | 74cb53c443502d59b4798342f03be24981448546 /net/ipv6/ip6_tunnel.c | |
| parent | 82e9f105a28006e7ff864220a28cf62ea6d1e280 (diff) | |
| download | op-kernel-dev-3308de2b841e5f25bdc4a7208a451f52f8cff969.zip op-kernel-dev-3308de2b841e5f25bdc4a7208a451f52f8cff969.tar.gz | |
ipv6: add ip6_flowlabel helper
And use it if possible.
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/ipv6/ip6_tunnel.c')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index f5e8a98..8d7c986 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -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; |
