Merge tag 'for-4.6' of git://git.osdn.jp/gitroot/uclinux-h8/linux

[deliverable/linux.git] / drivers / net / geneve.c

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 192631a345dfe6e9a36b976323e340f0693b6123..bc168894bda32d0723f7d77aa475f59bd2c7d75a 100644 (file)
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -843,8 +843,8 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb,
        if (info) {
                fl6->daddr = info->key.u.ipv6.dst;
                fl6->saddr = info->key.u.ipv6.src;
-               fl6->flowi6_tos = RT_TOS(info->key.tos);
-               fl6->flowlabel = info->key.label;
+               fl6->flowlabel = ip6_make_flowinfo(RT_TOS(info->key.tos),
+                                                  info->key.label);
                dst_cache = &info->dst_cache;
        } else {
                prio = geneve->tos;
@@ -855,8 +855,8 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb,
                        use_cache = false;
                }
 
-               fl6->flowi6_tos = RT_TOS(prio);
-               fl6->flowlabel = geneve->label;
+               fl6->flowlabel = ip6_make_flowinfo(RT_TOS(prio),
+                                                  geneve->label);
                fl6->daddr = geneve->remote.sin6.sin6_addr;
                dst_cache = &geneve->dst_cache;
        }
@@ -1049,7 +1049,8 @@ static netdev_tx_t geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev,
                if (unlikely(err))
                        goto err;
 
-               prio = ip_tunnel_ecn_encap(fl6.flowi6_tos, iip, skb);
+               prio = ip_tunnel_ecn_encap(ip6_tclass(fl6.flowlabel),
+                                          iip, skb);
                ttl = geneve->ttl;
                if (!ttl && ipv6_addr_is_multicast(&fl6.daddr))
                        ttl = 1;