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

Commit 9bd85e32 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[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: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 06f0511d

include/linux/inetdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ extern int devinet_ioctl(unsigned int cmd, void __user *); 
extern void		devinet_init(void);

extern struct in_device	*inetdev_by_index(int);

extern __be32		inet_select_addr(const struct net_device *dev, __be32 dst, int scope);

extern __be32		inet_confirm_addr(const struct net_device *dev, __be32 dst, __be32 local, int scope);

extern __be32		inet_confirm_addr(struct in_device *in_dev, __be32 dst, __be32 local, int scope);

extern struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix, __be32 mask);



static __inline__ int inet_ifa_match(__be32 addr, struct in_ifaddr *ifa)

net/ipv4/arp.c

+5 −6
Original line number Diff line number Diff line
@@ -382,8 +382,7 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb) 
		read_unlock_bh(&neigh->lock);

}



static int arp_ignore(struct in_device *in_dev, struct net_device *dev,

		      __be32 sip, __be32 tip)

static int arp_ignore(struct in_device *in_dev, __be32 sip, __be32 tip)

{

	int scope;
@@ -403,7 +402,7 @@ static int arp_ignore(struct in_device *in_dev, struct net_device *dev, 
	case 3:	/* Do not reply for scope host addresses */

		sip = 0;

		scope = RT_SCOPE_LINK;

		dev = NULL;

		in_dev = NULL;

		break;

	case 4:	/* Reserved */

	case 5:
@@ -415,7 +414,7 @@ static int arp_ignore(struct in_device *in_dev, struct net_device *dev, 
	default:

		return 0;

	}

	return !inet_confirm_addr(dev, sip, tip, scope);

	return !inet_confirm_addr(in_dev, sip, tip, scope);

}



static int arp_filter(__be32 sip, __be32 tip, struct net_device *dev)
@@ -807,7 +806,7 @@ static int arp_process(struct sk_buff *skb) 
	if (sip == 0) {

		if (arp->ar_op == htons(ARPOP_REQUEST) &&

		    inet_addr_type(&init_net, tip) == RTN_LOCAL &&

		    !arp_ignore(in_dev,dev,sip,tip))

		    !arp_ignore(in_dev, sip, tip))

			arp_send(ARPOP_REPLY, ETH_P_ARP, sip, dev, tip, sha,

				 dev->dev_addr, sha);

		goto out;
@@ -825,7 +824,7 @@ static int arp_process(struct sk_buff *skb) 
				int dont_send = 0;



				if (!dont_send)

					dont_send |= arp_ignore(in_dev,dev,sip,tip);

					dont_send |= arp_ignore(in_dev,sip,tip);

				if (!dont_send && IN_DEV_ARPFILTER(in_dev))

					dont_send |= arp_filter(sip,tip,dev);

				if (!dont_send)

net/ipv4/devinet.c

+6 −11
Original line number Diff line number Diff line
@@ -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();