|
@@ -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)
|