diff options
| author | Pravin B Shelar <pshelar@ovn.org> | 2016-05-23 20:27:14 -0700 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@ovn.org> | 2016-05-23 20:27:14 -0700 |
| commit | 98c086db48a1192f6ee316b90fa3739512aebd63 (patch) | |
| tree | fab35a531a7661f5bb5ce3b65c6a17555b2413b1 /lib/netdev-native-tnl.c | |
| parent | 4975aa3ee6a8e5643b12e8d8d66facb705d11367 (diff) | |
| download | openvswitch-98c086db48a1192f6ee316b90fa3739512aebd63.tar.gz | |
netdev-native-tnl: Fix IPv6 tos bits handling.
IPv6 tunnels ignores outer tos bits on recieve and does not
set it on xmit. Following patch fixes it.
Signed-off-by: Pravin B Shelar <pshelar@ovn.org>
Acked-by: Jesse Gross <jesse@kernel.org>
Diffstat (limited to 'lib/netdev-native-tnl.c')
| -rw-r--r-- | lib/netdev-native-tnl.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index ba87835b2..e14467946 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -126,10 +126,12 @@ netdev_tnl_ip_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl, *hlen += IP_HEADER_LEN; } else if (IP_VER(ip->ip_ihl_ver) == 6) { + ovs_be32 tc_flow = get_16aligned_be32(&ip6->ip6_flow); memcpy(tnl->ipv6_src.s6_addr, ip6->ip6_src.be16, sizeof ip6->ip6_src); memcpy(tnl->ipv6_dst.s6_addr, ip6->ip6_dst.be16, sizeof ip6->ip6_dst); - tnl->ip_tos = 0; + + tnl->ip_tos = ntohl(tc_flow) >> 20; tnl->ip_ttl = ip6->ip6_hlim; *hlen += IPV6_HEADER_LEN; @@ -294,7 +296,8 @@ netdev_tnl_ip_build_header(struct ovs_action_push_tnl *data, ip6 = (struct ovs_16aligned_ip6_hdr *) l3; - ip6->ip6_vfc = 0x60; + put_16aligned_be32(&ip6->ip6_flow, htonl(6 << 28) | + htonl(params->flow->tunnel.ip_tos << 20)); ip6->ip6_hlim = params->flow->tunnel.ip_ttl; ip6->ip6_nxt = next_proto; memcpy(&ip6->ip6_src, params->s_ip, sizeof(ovs_be32[4])); |