Commit f78c75d8 authored by Petr Machata's avatar Petr Machata Committed by Jakub Kicinski
Browse files

net: ipv6: Add a flags argument to ip6tunnel_xmit(), udp_tunnel6_xmit_skb() 



ip6tunnel_xmit() erases the contents of the SKB control block. In order to
be able to set particular IP6CB flags on the SKB, add a corresponding
parameter, and propagate it to udp_tunnel6_xmit_skb() as well.

In one of the following patches, VXLAN driver will use this facility to
mark packets as subject to IPv6 multicast routing.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarNikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/acb4f9f3e40c3a931236c3af08a720b017fbfbfb.1750113335.git.petrm@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 6a7d88ca

drivers/net/bareudp.c

+2 −1
Original line number Diff line number Diff line
@@ -431,7 +431,8 @@ static int bareudp6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
			     &saddr, &daddr, prio, ttl,

			     info->key.label, sport, bareudp->port,

			     !test_bit(IP_TUNNEL_CSUM_BIT,

				       info->key.tun_flags));

				       info->key.tun_flags),

			     0);

	return 0;



free_dst:

drivers/net/geneve.c

+2 −1
Original line number Diff line number Diff line
@@ -1014,7 +1014,8 @@ static int geneve6_xmit_skb(struct sk_buff *skb, struct net_device *dev, 
			     &saddr, &key->u.ipv6.dst, prio, ttl,

			     info->key.label, sport, geneve->cfg.info.key.tp_dst,

			     !test_bit(IP_TUNNEL_CSUM_BIT,

				       info->key.tun_flags));

				       info->key.tun_flags),

			     0);

	return 0;

}

#endif

drivers/net/gtp.c

+1 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ static netdev_tx_t gtp_dev_xmit(struct sk_buff *skb, struct net_device *dev) 
				     ip6_dst_hoplimit(&pktinfo.rt->dst),

				     0,

				     pktinfo.gtph_port, pktinfo.gtph_port,

				     false);

				     false, 0);

#else

		goto tx_err;

#endif

drivers/net/ovpn/udp.c

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ static int ovpn_udp6_output(struct ovpn_peer *peer, struct ovpn_bind *bind, 
	skb->ignore_df = 1;

	udp_tunnel6_xmit_skb(dst, sk, skb, skb->dev, &fl.saddr, &fl.daddr, 0,

			     ip6_dst_hoplimit(dst), 0, fl.fl6_sport,

			     fl.fl6_dport, udp_get_no_check6_tx(sk));

			     fl.fl6_dport, udp_get_no_check6_tx(sk), 0);

	ret = 0;

err:

	local_bh_enable();

drivers/net/vxlan/vxlan_core.c

+2 −1
Original line number Diff line number Diff line
@@ -2586,7 +2586,8 @@ void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, 


		udp_tunnel6_xmit_skb(ndst, sock6->sock->sk, skb, dev,

				     &saddr, &pkey->u.ipv6.dst, tos, ttl,

				     pkey->label, src_port, dst_port, !udp_sum);

				     pkey->label, src_port, dst_port, !udp_sum,

				     0);

#endif

	}

	vxlan_vnifilter_count(vxlan, vni, NULL, VXLAN_VNI_STATS_TX, pkt_len);