Commit 5022e221 authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Paolo Abeni
Browse files

net: change the type of ip_route_input_rcu to static 



The type of ip_route_input_rcu should be static.

Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Link: https://lore.kernel.org/r/20220711073549.8947-1-shaozhengchao@huawei.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent bfc54866

include/net/route.h

+0 −4
Original line number Diff line number Diff line
@@ -201,10 +201,6 @@ int ip_mc_validate_source(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
			  struct in_device *in_dev, u32 *itag);

int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 src,

			 u8 tos, struct net_device *devin);

int ip_route_input_rcu(struct sk_buff *skb, __be32 dst, __be32 src,

		       u8 tos, struct net_device *devin,

		       struct fib_result *res);



int ip_route_use_hint(struct sk_buff *skb, __be32 dst, __be32 src,

		      u8 tos, struct net_device *devin,

		      const struct sk_buff *hint);

net/ipv4/route.c

+17 −17
Original line number Diff line number Diff line
@@ -2439,23 +2439,8 @@ out: return err; 
	goto out;

}



int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,

			 u8 tos, struct net_device *dev)

{

	struct fib_result res;

	int err;



	tos &= IPTOS_RT_MASK;

	rcu_read_lock();

	err = ip_route_input_rcu(skb, daddr, saddr, tos, dev, &res);

	rcu_read_unlock();



	return err;

}

EXPORT_SYMBOL(ip_route_input_noref);



/* called with rcu_read_lock held */

int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr,

static int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr,

			      u8 tos, struct net_device *dev, struct fib_result *res)

{

	/* Multicast recognition logic is moved from route cache to here.
@@ -2505,6 +2490,21 @@ int ip_route_input_rcu(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
	return ip_route_input_slow(skb, daddr, saddr, tos, dev, res);

}



int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,

			 u8 tos, struct net_device *dev)

{

	struct fib_result res;

	int err;



	tos &= IPTOS_RT_MASK;

	rcu_read_lock();

	err = ip_route_input_rcu(skb, daddr, saddr, tos, dev, &res);

	rcu_read_unlock();



	return err;

}

EXPORT_SYMBOL(ip_route_input_noref);



/* called with rcu_read_lock() */

static struct rtable *__mkroute_output(const struct fib_result *res,

				       const struct flowi4 *fl4, int orig_oif,