Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0066da5 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

ip_tunnel: Rename & publish init_tunnel_flow 



Initializing struct flowi4 is useful for drivers that need to emulate
routing decisions made by a tunnel interface. Publish the
function (appropriately renamed) so that the drivers in question don't
need to cut'n'paste it around.

Signed-off-by: default avatarPetr Machata <petrm@mellanox.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1b2a6c4

include/net/ip_tunnels.h

+16 −0
Original line number Diff line number Diff line
@@ -254,6 +254,22 @@ static inline __be32 tunnel_id_to_key32(__be64 tun_id) 


#ifdef CONFIG_INET



static inline void ip_tunnel_init_flow(struct flowi4 *fl4,

				       int proto,

				       __be32 daddr, __be32 saddr,

				       __be32 key, __u8 tos, int oif,

				       __u32 mark)

{

	memset(fl4, 0, sizeof(*fl4));

	fl4->flowi4_oif = oif;

	fl4->daddr = daddr;

	fl4->saddr = saddr;

	fl4->flowi4_tos = tos;

	fl4->flowi4_proto = proto;

	fl4->fl4_gre_key = key;

	fl4->flowi4_mark = mark;

}



int ip_tunnel_init(struct net_device *dev);

void ip_tunnel_uninit(struct net_device *dev);

void  ip_tunnel_dellink(struct net_device *dev, struct list_head *head);

net/ipv4/ip_tunnel.c

+12 −28
Original line number Diff line number Diff line
@@ -290,22 +290,6 @@ static struct net_device *__ip_tunnel_create(struct net *net, 
	return ERR_PTR(err);

}



static inline void init_tunnel_flow(struct flowi4 *fl4,

				    int proto,

				    __be32 daddr, __be32 saddr,

				    __be32 key, __u8 tos, int oif,

				    __u32 mark)

{

	memset(fl4, 0, sizeof(*fl4));

	fl4->flowi4_oif = oif;

	fl4->daddr = daddr;

	fl4->saddr = saddr;

	fl4->flowi4_tos = tos;

	fl4->flowi4_proto = proto;

	fl4->fl4_gre_key = key;

	fl4->flowi4_mark = mark;

}



static int ip_tunnel_bind_dev(struct net_device *dev)

{

	struct net_device *tdev = NULL;
@@ -322,7 +306,7 @@ static int ip_tunnel_bind_dev(struct net_device *dev) 
		struct flowi4 fl4;

		struct rtable *rt;



		init_tunnel_flow(&fl4, iph->protocol, iph->daddr,

		ip_tunnel_init_flow(&fl4, iph->protocol, iph->daddr,

				    iph->saddr, tunnel->parms.o_key,

				    RT_TOS(iph->tos), tunnel->parms.link,

				    tunnel->fwmark);
@@ -581,7 +565,7 @@ void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, u8 proto) 
		else if (skb->protocol == htons(ETH_P_IPV6))

			tos = ipv6_get_dsfield((const struct ipv6hdr *)inner_iph);

	}

	init_tunnel_flow(&fl4, proto, key->u.ipv4.dst, key->u.ipv4.src, 0,

	ip_tunnel_init_flow(&fl4, proto, key->u.ipv4.dst, key->u.ipv4.src, 0,

			    RT_TOS(tos), tunnel->parms.link, tunnel->fwmark);

	if (tunnel->encap.type != TUNNEL_ENCAP_NONE)

		goto tx_error;
@@ -711,14 +695,14 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, 
	}



	if (tunnel->fwmark) {

		init_tunnel_flow(&fl4, protocol, dst, tnl_params->saddr,

				 tunnel->parms.o_key, RT_TOS(tos), tunnel->parms.link,

				 tunnel->fwmark);

		ip_tunnel_init_flow(&fl4, protocol, dst, tnl_params->saddr,

				    tunnel->parms.o_key, RT_TOS(tos),

				    tunnel->parms.link, tunnel->fwmark);

	}

	else {

		init_tunnel_flow(&fl4, protocol, dst, tnl_params->saddr,

				 tunnel->parms.o_key, RT_TOS(tos), tunnel->parms.link,

				 skb->mark);

		ip_tunnel_init_flow(&fl4, protocol, dst, tnl_params->saddr,

				    tunnel->parms.o_key, RT_TOS(tos),

				    tunnel->parms.link, skb->mark);

	}



	if (ip_tunnel_encap(skb, tunnel, &protocol, &fl4) < 0)