diff options
author | Jiri Benc <jbenc@redhat.com> | 2015-08-20 13:56:24 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-08-20 15:42:36 -0700 |
commit | 7c383fb2254c44e096427470da6a36380169b548 (patch) | |
tree | 59edb97a78757af878dc775999071684cbafc9dc /net/openvswitch/vport.h | |
parent | c1ea5d672aaff08da337dee735dbb548e3415585 (diff) | |
download | linux-stable-7c383fb2254c44e096427470da6a36380169b548.tar.gz linux-stable-7c383fb2254c44e096427470da6a36380169b548.tar.bz2 linux-stable-7c383fb2254c44e096427470da6a36380169b548.zip |
ip_tunnels: use tos and ttl fields also for IPv6
Rename the ipv4_tos and ipv4_ttl fields to just 'tos' and 'ttl', as they'll
be used with IPv6 tunnels, too.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch/vport.h')
-rw-r--r-- | net/openvswitch/vport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h index 43d8f5a835cb..b88b3ee86f07 100644 --- a/net/openvswitch/vport.h +++ b/net/openvswitch/vport.h @@ -256,7 +256,7 @@ static inline struct rtable *ovs_tunnel_route_lookup(struct net *net, memset(fl, 0, sizeof(*fl)); fl->daddr = key->u.ipv4.dst; fl->saddr = key->u.ipv4.src; - fl->flowi4_tos = RT_TOS(key->ipv4_tos); + fl->flowi4_tos = RT_TOS(key->tos); fl->flowi4_mark = mark; fl->flowi4_proto = protocol; |