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

Commit 38a424e4 authored by David Miller's avatar David Miller Committed by David S. Miller
Browse files

ipv4: Kill ip_route_input_noref(). 



The "noref" argument to ip_route_input_common() is now always ignored
because we do not cache routes, and in that case we must always grab
a reference to the resulting 'dst'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 89aef892

include/net/route.h

+2 −14
Original line number Diff line number Diff line
@@ -160,20 +160,8 @@ static inline struct rtable *ip_route_output_gre(struct net *net, struct flowi4 
	return ip_route_output_key(net, fl4);

}



extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src,

				 u8 tos, struct net_device *devin, bool noref);



static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src,

				 u8 tos, struct net_device *devin)

{

	return ip_route_input_common(skb, dst, src, tos, devin, false);

}



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

				       u8 tos, struct net_device *devin)

{

	return ip_route_input_common(skb, dst, src, tos, devin, true);

}

extern int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src,

			  u8 tos, struct net_device *devin);



extern void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,

			     int oif, u32 mark, u8 protocol, int flow_flags);

net/ipv4/arp.c

+1 −1
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ static int arp_process(struct sk_buff *skb) 
	}



	if (arp->ar_op == htons(ARPOP_REQUEST) &&

	    ip_route_input_noref(skb, tip, sip, 0, dev) == 0) {

	    ip_route_input(skb, tip, sip, 0, dev) == 0) {



		rt = skb_rtable(skb);

		addr_type = rt->rt_type;

net/ipv4/ip_fragment.c

+2 −2
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static void ip_expire(unsigned long arg) 
		/* skb dst is stale, drop it, and perform route lookup again */

		skb_dst_drop(head);

		iph = ip_hdr(head);

		err = ip_route_input_noref(head, iph->daddr, iph->saddr,

		err = ip_route_input(head, iph->daddr, iph->saddr,

				     iph->tos, head->dev);

		if (err)

			goto out_rcu_unlock;

net/ipv4/ip_input.c

+2 −2
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static int ip_rcv_finish(struct sk_buff *skb) 
	 *	how the packet travels inside Linux networking.

	 */

	if (!skb_dst(skb)) {

		int err = ip_route_input_noref(skb, iph->daddr, iph->saddr,

		int err = ip_route_input(skb, iph->daddr, iph->saddr,

					 iph->tos, skb->dev);

		if (unlikely(err)) {

			if (err == -EXDEV)

net/ipv4/route.c

+3 −3
Original line number Diff line number Diff line
@@ -1620,8 +1620,8 @@ martian_source_keep_err: 
	goto out;

}



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

			   u8 tos, struct net_device *dev, bool noref)

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

		   u8 tos, struct net_device *dev)

{

	int res;
@@ -1664,7 +1664,7 @@ int ip_route_input_common(struct sk_buff *skb, __be32 daddr, __be32 saddr, 
	rcu_read_unlock();

	return res;

}

EXPORT_SYMBOL(ip_route_input_common);

EXPORT_SYMBOL(ip_route_input);



/* called with rcu_read_lock() */

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