Commit 7c383fb2 authored by Jiri Benc's avatar Jiri Benc Committed by David S. Miller
Browse files

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: default avatarJiri Benc <jbenc@redhat.com>
Acked-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1ea5d67

drivers/net/vxlan.c

+4 −4
Original line number Diff line number Diff line
@@ -1278,8 +1278,8 @@ static int vxlan_udp_encap_recv(struct sock *sk, struct sk_buff *skb) 
		info = &tun_dst->u.tun_info;

		info->key.u.ipv4.src = iph->saddr;

		info->key.u.ipv4.dst = iph->daddr;

		info->key.ipv4_tos = iph->tos;

		info->key.ipv4_ttl = iph->ttl;

		info->key.tos = iph->tos;

		info->key.ttl = iph->ttl;

		info->key.tp_src = udp_hdr(skb)->source;

		info->key.tp_dst = udp_hdr(skb)->dest;
@@ -1960,8 +1960,8 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 
			else

				flags &= ~VXLAN_F_UDP_CSUM;



			ttl = info->key.ipv4_ttl;

			tos = info->key.ipv4_tos;

			ttl = info->key.ttl;

			tos = info->key.tos;



			if (info->options_len)

				md = ip_tunnel_info_opts(info, sizeof(*md));

include/net/ip_tunnels.h

+4 −4
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ struct ip_tunnel_key { 
		} ipv6;

	} u;

	__be16			tun_flags;

	u8			ipv4_tos;

	u8			ipv4_ttl;

	u8			tos;		/* TOS for IPv4, TC for IPv6 */

	u8			ttl;		/* TTL for IPv4, HL for IPv6 */

	__be16			tp_src;

	__be16			tp_dst;

};
@@ -195,8 +195,8 @@ static inline void __ip_tunnel_info_init(struct ip_tunnel_info *tun_info, 
	tun_info->key.u.ipv4.dst = daddr;

	memset((unsigned char *)&tun_info->key + IP_TUNNEL_KEY_IPV4_PAD,

	       0, IP_TUNNEL_KEY_IPV4_PAD_LEN);

	tun_info->key.ipv4_tos = tos;

	tun_info->key.ipv4_ttl = ttl;

	tun_info->key.tos = tos;

	tun_info->key.ttl = ttl;

	tun_info->key.tun_flags = tun_flags;



	/* For the tunnel types on the top of IPsec, the tp_src and tp_dst of

net/ipv4/ip_gre.c

+4 −4
Original line number Diff line number Diff line
@@ -409,8 +409,8 @@ static int ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi) 
			info = &tun_dst->u.tun_info;

			info->key.u.ipv4.src = iph->saddr;

			info->key.u.ipv4.dst = iph->daddr;

			info->key.ipv4_tos = iph->tos;

			info->key.ipv4_ttl = iph->ttl;

			info->key.tos = iph->tos;

			info->key.ttl = iph->ttl;



			info->mode = IP_TUNNEL_INFO_RX;

			info->key.tun_flags = tpi->flags &
@@ -529,7 +529,7 @@ static void gre_fb_xmit(struct sk_buff *skb, struct net_device *dev) 
	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 = skb->mark;

	fl.flowi4_proto = IPPROTO_GRE;
@@ -565,7 +565,7 @@ static void gre_fb_xmit(struct sk_buff *skb, struct net_device *dev) 
	df = key->tun_flags & TUNNEL_DONT_FRAGMENT ?  htons(IP_DF) : 0;

	err = iptunnel_xmit(skb->sk, rt, skb, fl.saddr,

			    key->u.ipv4.dst, IPPROTO_GRE,

			    key->ipv4_tos, key->ipv4_ttl, df, false);

			    key->tos, key->ttl, df, false);

	iptunnel_xmit_stats(err, &dev->stats, dev->tstats);

	return;

net/ipv4/ip_tunnel_core.c

+4 −4
Original line number Diff line number Diff line
@@ -233,10 +233,10 @@ static int ip_tun_build_state(struct net_device *dev, struct nlattr *attr, 
		tun_info->key.u.ipv4.src = nla_get_be32(tb[LWTUNNEL_IP_SRC]);



	if (tb[LWTUNNEL_IP_TTL])

		tun_info->key.ipv4_ttl = nla_get_u8(tb[LWTUNNEL_IP_TTL]);

		tun_info->key.ttl = nla_get_u8(tb[LWTUNNEL_IP_TTL]);



	if (tb[LWTUNNEL_IP_TOS])

		tun_info->key.ipv4_tos = nla_get_u8(tb[LWTUNNEL_IP_TOS]);

		tun_info->key.tos = nla_get_u8(tb[LWTUNNEL_IP_TOS]);



	if (tb[LWTUNNEL_IP_SPORT])

		tun_info->key.tp_src = nla_get_be16(tb[LWTUNNEL_IP_SPORT]);
@@ -264,8 +264,8 @@ static int ip_tun_fill_encap_info(struct sk_buff *skb, 
	if (nla_put_u64(skb, LWTUNNEL_IP_ID, tun_info->key.tun_id) ||

	    nla_put_be32(skb, LWTUNNEL_IP_DST, tun_info->key.u.ipv4.dst) ||

	    nla_put_be32(skb, LWTUNNEL_IP_SRC, tun_info->key.u.ipv4.src) ||

	    nla_put_u8(skb, LWTUNNEL_IP_TOS, tun_info->key.ipv4_tos) ||

	    nla_put_u8(skb, LWTUNNEL_IP_TTL, tun_info->key.ipv4_ttl) ||

	    nla_put_u8(skb, LWTUNNEL_IP_TOS, tun_info->key.tos) ||

	    nla_put_u8(skb, LWTUNNEL_IP_TTL, tun_info->key.ttl) ||

	    nla_put_u16(skb, LWTUNNEL_IP_SPORT, tun_info->key.tp_src) ||

	    nla_put_u16(skb, LWTUNNEL_IP_DPORT, tun_info->key.tp_dst) ||

	    nla_put_u16(skb, LWTUNNEL_IP_FLAGS, tun_info->key.tun_flags))

net/openvswitch/flow_netlink.c

+5 −5
Original line number Diff line number Diff line
@@ -542,11 +542,11 @@ static int ipv4_tun_from_nlattr(const struct nlattr *attr, 
					nla_get_in_addr(a), is_mask);

			break;

		case OVS_TUNNEL_KEY_ATTR_TOS:

			SW_FLOW_KEY_PUT(match, tun_key.ipv4_tos,

			SW_FLOW_KEY_PUT(match, tun_key.tos,

					nla_get_u8(a), is_mask);

			break;

		case OVS_TUNNEL_KEY_ATTR_TTL:

			SW_FLOW_KEY_PUT(match, tun_key.ipv4_ttl,

			SW_FLOW_KEY_PUT(match, tun_key.ttl,

					nla_get_u8(a), is_mask);

			ttl = true;

			break;
@@ -655,10 +655,10 @@ static int __ipv4_tun_to_nlattr(struct sk_buff *skb, 
	    nla_put_in_addr(skb, OVS_TUNNEL_KEY_ATTR_IPV4_DST,

			    output->u.ipv4.dst))

		return -EMSGSIZE;

	if (output->ipv4_tos &&

	    nla_put_u8(skb, OVS_TUNNEL_KEY_ATTR_TOS, output->ipv4_tos))

	if (output->tos &&

	    nla_put_u8(skb, OVS_TUNNEL_KEY_ATTR_TOS, output->tos))

		return -EMSGSIZE;

	if (nla_put_u8(skb, OVS_TUNNEL_KEY_ATTR_TTL, output->ipv4_ttl))

	if (nla_put_u8(skb, OVS_TUNNEL_KEY_ATTR_TTL, output->ttl))

		return -EMSGSIZE;

	if ((output->tun_flags & TUNNEL_DONT_FRAGMENT) &&

	    nla_put_flag(skb, OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT))

CRA Git | Maintained and supported by SUSTech CRA and CCSE