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

Commit 4a65896f authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: l3mdev: Move get_saddr and rt6_dst 



Move l3mdev_rt6_dst_by_oif and l3mdev_get_saddr to l3mdev.c. Collapse
l3mdev_get_rt6_dst into l3mdev_rt6_dst_by_oif since it is the only
user and keep the l3mdev_get_rt6_dst name for consistency with other
hooks.

A follow-on patch adds more code to these functions making them long
for inlined functions.

Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 27c0f739

include/net/l3mdev.h

+3 −53
Original line number Diff line number Diff line
@@ -130,52 +130,9 @@ static inline bool netif_index_is_l3_master(struct net *net, int ifindex) 
	return rc;

}



static inline int l3mdev_get_saddr(struct net *net, int ifindex,

				   struct flowi4 *fl4)

{

	struct net_device *dev;

	int rc = 0;

int l3mdev_get_saddr(struct net *net, int ifindex, struct flowi4 *fl4);



	if (ifindex) {



		rcu_read_lock();



		dev = dev_get_by_index_rcu(net, ifindex);

		if (dev && netif_is_l3_master(dev) &&

		    dev->l3mdev_ops->l3mdev_get_saddr) {

			rc = dev->l3mdev_ops->l3mdev_get_saddr(dev, fl4);

		}



		rcu_read_unlock();

	}



	return rc;

}



static inline struct dst_entry *l3mdev_get_rt6_dst(const struct net_device *dev,

						   const struct flowi6 *fl6)

{

	if (netif_is_l3_master(dev) && dev->l3mdev_ops->l3mdev_get_rt6_dst)

		return dev->l3mdev_ops->l3mdev_get_rt6_dst(dev, fl6);



	return NULL;

}



static inline

struct dst_entry *l3mdev_rt6_dst_by_oif(struct net *net,

					const struct flowi6 *fl6)

{

	struct dst_entry *dst = NULL;

	struct net_device *dev;



	dev = dev_get_by_index(net, fl6->flowi6_oif);

	if (dev) {

		dst = l3mdev_get_rt6_dst(dev, fl6);

		dev_put(dev);

	}



	return dst;

}

struct dst_entry *l3mdev_get_rt6_dst(struct net *net, const struct flowi6 *fl6);



#else
@@ -233,14 +190,7 @@ static inline int l3mdev_get_saddr(struct net *net, int ifindex, 
}



static inline

struct dst_entry *l3mdev_get_rt6_dst(const struct net_device *dev,

				     const struct flowi6 *fl6)

{

	return NULL;

}

static inline

struct dst_entry *l3mdev_rt6_dst_by_oif(struct net *net,

					const struct flowi6 *fl6)

struct dst_entry *l3mdev_get_rt6_dst(struct net *net, const struct flowi6 *fl6)

{

	return NULL;

}

net/ipv6/route.c

+1 −1
Original line number Diff line number Diff line
@@ -1190,7 +1190,7 @@ struct dst_entry *ip6_route_output_flags(struct net *net, const struct sock *sk, 
	struct dst_entry *dst;

	bool any_src;



	dst = l3mdev_rt6_dst_by_oif(net, fl6);

	dst = l3mdev_get_rt6_dst(net, fl6);

	if (dst)

		return dst;

net/l3mdev/l3mdev.c

+54 −0
Original line number Diff line number Diff line
@@ -97,3 +97,57 @@ u32 l3mdev_fib_table_by_index(struct net *net, int ifindex) 
	return tb_id;

}

EXPORT_SYMBOL_GPL(l3mdev_fib_table_by_index);



/**

 *	l3mdev_get_rt6_dst - IPv6 route lookup based on flow. Returns

 *			     cached route for L3 master device if relevant

 *			     to flow

 *	@net: network namespace for device index lookup

 *	@fl6: IPv6 flow struct for lookup

 */



struct dst_entry *l3mdev_get_rt6_dst(struct net *net,

				     const struct flowi6 *fl6)

{

	struct dst_entry *dst = NULL;

	struct net_device *dev;



	dev = dev_get_by_index(net, fl6->flowi6_oif);

	if (dev) {

		if (netif_is_l3_master(dev) &&

		    dev->l3mdev_ops->l3mdev_get_rt6_dst)

			dst = dev->l3mdev_ops->l3mdev_get_rt6_dst(dev, fl6);

		dev_put(dev);

	}



	return dst;

}

EXPORT_SYMBOL_GPL(l3mdev_get_rt6_dst);



/**

 *	l3mdev_get_saddr - get source address for a flow based on an interface

 *			   enslaved to an L3 master device

 *	@net: network namespace for device index lookup

 *	@ifindex: Interface index

 *	@fl4: IPv4 flow struct

 */



int l3mdev_get_saddr(struct net *net, int ifindex, struct flowi4 *fl4)

{

	struct net_device *dev;

	int rc = 0;



	if (ifindex) {

		rcu_read_lock();



		dev = dev_get_by_index_rcu(net, ifindex);

		if (dev && netif_is_l3_master(dev) &&

		    dev->l3mdev_ops->l3mdev_get_saddr)

			rc = dev->l3mdev_ops->l3mdev_get_saddr(dev, fl4);



		rcu_read_unlock();

	}



	return rc;

}

EXPORT_SYMBOL_GPL(l3mdev_get_saddr);