소스 검색

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>
David Ahern 8 년 전
부모
커밋
9f09eaeae2
3개의 변경된 파일3개의 추가작업 그리고 8개의 파일을 삭제
  1. 1 1
      include/linux/mroute.h
  2. 1 6
      net/ipv4/ipmr.c
  3. 1 1
      net/ipv4/route.c

+ 1 - 1
include/linux/mroute.h

@@ -120,5 +120,5 @@ struct mfc_cache {
 struct rtmsg;
 struct rtmsg;
 int ipmr_get_route(struct net *net, struct sk_buff *skb,
 int ipmr_get_route(struct net *net, struct sk_buff *skb,
 		   __be32 saddr, __be32 daddr,
 		   __be32 saddr, __be32 daddr,
-		   struct rtmsg *rtm, int nowait, u32 portid);
+		   struct rtmsg *rtm, u32 portid);
 #endif
 #endif

+ 1 - 6
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,
 int ipmr_get_route(struct net *net, struct sk_buff *skb,
 		   __be32 saddr, __be32 daddr,
 		   __be32 saddr, __be32 daddr,
-		   struct rtmsg *rtm, int nowait, u32 portid)
+		   struct rtmsg *rtm, u32 portid)
 {
 {
 	struct mfc_cache *cache;
 	struct mfc_cache *cache;
 	struct mr_table *mrt;
 	struct mr_table *mrt;
@@ -2160,11 +2160,6 @@ int ipmr_get_route(struct net *net, struct sk_buff *skb,
 		struct net_device *dev;
 		struct net_device *dev;
 		int vif = -1;
 		int vif = -1;
 
 
-		if (nowait) {
-			rcu_read_unlock();
-			return -EAGAIN;
-		}
-
 		dev = skb->dev;
 		dev = skb->dev;
 		read_lock(&mrt_lock);
 		read_lock(&mrt_lock);
 		if (dev)
 		if (dev)

+ 1 - 1
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)) {
 		    IPV4_DEVCONF_ALL(net, MC_FORWARDING)) {
 			int err = ipmr_get_route(net, skb,
 			int err = ipmr_get_route(net, skb,
 						 fl4->saddr, fl4->daddr,
 						 fl4->saddr, fl4->daddr,
-						 r, 0, portid);
+						 r, portid);
 
 
 			if (err <= 0) {
 			if (err <= 0) {
 				if (err == 0)
 				if (err == 0)