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: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/mroute.h b/include/linux/mroute.h
index e5fb81376e92ff2e1feac6130f07e7af7d9ca003..f019b62f27b5cce542aaf6552a60c1b8965164c8 100644 (file)
--- a/include/linux/mroute.h
+++ b/include/linux/mroute.h
@@ -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

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index b35dda57586bc59668172eac965caf9cd202b15a..824c4fdf21ebc7fe89e712cbb016a7eb2ac736db 100644 (file)
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -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)

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 7b52ac20145baeafa4f20093e4bbfe0b120e6f39..0965f8c59e7e4757d2deb5072f43cd3eb344b48d 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -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)