[IPV4]: Remove extra argument from arp_ignore.

arp_ignore has two arguments: dev & in_dev. dev is used for
inet_confirm_addr calling only.

inet_confirm_addr, in turn, either gets in_dev from the device passed
or iterates over all network devices if the device passed is NULL. It
seems logical to directly pass in_dev into inet_confirm_addr.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 11 deletions

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 03db15b10309..dc1665a2b075 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -968,24 +968,19 @@ static __be32 confirm_addr_indev(struct in_device *in_dev, __be32 dst,
 
 /*
  * Confirm that local IP address exists using wildcards:
- * - dev: only on this interface, 0=any interface
+ * - in_dev: only on this interface, 0=any interface
  * - dst: only in the same subnet as dst, 0=any dst
  * - local: address, 0=autoselect the local address
  * - scope: maximum allowed scope value for the local address
  */
-__be32 inet_confirm_addr(const struct net_device *dev, __be32 dst, __be32 local, int scope)
+__be32 inet_confirm_addr(struct in_device *in_dev,
+                         __be32 dst, __be32 local, int scope)
 {
         __be32 addr = 0;
-        struct in_device *in_dev;
-
-        if (dev) {
-                rcu_read_lock();
-                if ((in_dev = __in_dev_get_rcu(dev)))
-                        addr = confirm_addr_indev(in_dev, dst, local, scope);
-                rcu_read_unlock();
+        struct net_device *dev;
 
-                return addr;
-        }
+        if (in_dev != NULL)
+                return confirm_addr_indev(in_dev, dst, local, scope);
 
         read_lock(&dev_base_lock);
         rcu_read_lock();