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.c | |
parent | c1ea5d672aaff08da337dee735dbb548e3415585 (diff) | |
download | op-kernel-dev-7c383fb2254c44e096427470da6a36380169b548.zip op-kernel-dev-7c383fb2254c44e096427470da6a36380169b548.tar.gz |
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.c')
-rw-r--r-- | net/openvswitch/vport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index a06adc7..d73e5a1 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -604,8 +604,8 @@ int ovs_tunnel_get_egress_info(struct ip_tunnel_info *egress_tun_info, */ __ip_tunnel_info_init(egress_tun_info, fl.saddr, tun_key->u.ipv4.dst, - tun_key->ipv4_tos, - tun_key->ipv4_ttl, + tun_key->tos, + tun_key->ttl, tp_src, tp_dst, tun_key->tun_id, tun_key->tun_flags, |