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

Commit 9f09eaea authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net: ipmr: Remove nowait arg to ipmr_get_route 



ipmr_get_route has 1 caller and the nowait arg is 0. Remove the arg and
simplify ipmr_get_route accordingly.

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

include/linux/mroute.h

+1 −1
Original line number Diff line number Diff line
@@ -120,5 +120,5 @@ struct mfc_cache { 
struct rtmsg;

int ipmr_get_route(struct net *net, struct sk_buff *skb,

		   __be32 saddr, __be32 daddr,

		   struct rtmsg *rtm, int nowait, u32 portid);

		   struct rtmsg *rtm, u32 portid);

#endif

net/ipv4/ipmr.c

+1 −6
Original line number Diff line number Diff line
@@ -2136,7 +2136,7 @@ static int __ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb, 


int ipmr_get_route(struct net *net, struct sk_buff *skb,

		   __be32 saddr, __be32 daddr,

		   struct rtmsg *rtm, int nowait, u32 portid)

		   struct rtmsg *rtm, u32 portid)

{

	struct mfc_cache *cache;

	struct mr_table *mrt;
@@ -2160,11 +2160,6 @@ int ipmr_get_route(struct net *net, struct sk_buff *skb, 
		struct net_device *dev;

		int vif = -1;



		if (nowait) {

			rcu_read_unlock();

			return -EAGAIN;

		}



		dev = skb->dev;

		read_lock(&mrt_lock);

		if (dev)

net/ipv4/route.c

+1 −1
Original line number Diff line number Diff line
@@ -2541,7 +2541,7 @@ static int rt_fill_info(struct net *net, __be32 dst, __be32 src, u32 table_id, 
		    IPV4_DEVCONF_ALL(net, MC_FORWARDING)) {

			int err = ipmr_get_route(net, skb,

						 fl4->saddr, fl4->daddr,

						 r, 0, portid);

						 r, portid);



			if (err <= 0) {

				if (err == 0)