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

Commit 8b57fd1e authored by Gao Feng's avatar Gao Feng Committed by David S. Miller
Browse files

net: Eliminate duplicated codes by creating one new function in_dev_select_addr 



There are two duplicated loops codes which used to select right
address in current codes. Now eliminate these codes by creating
one new function in_dev_select_addr.

Signed-off-by: default avatarGao Feng <fgao@ikuai8.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 81663bee

net/ipv4/devinet.c

+18 −14
Original line number Diff line number Diff line
@@ -1192,6 +1192,18 @@ static int inet_gifconf(struct net_device *dev, char __user *buf, int len) 
	return done;

}



static __be32 in_dev_select_addr(const struct in_device *in_dev,

				 int scope)

{

	for_primary_ifa(in_dev) {

		if (ifa->ifa_scope != RT_SCOPE_LINK &&

		    ifa->ifa_scope <= scope)

			return ifa->ifa_local;

	} endfor_ifa(in_dev);



	return 0;

}



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

{

	__be32 addr = 0;
@@ -1228,14 +1240,10 @@ __be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope) 
	if (master_idx &&

	    (dev = dev_get_by_index_rcu(net, master_idx)) &&

	    (in_dev = __in_dev_get_rcu(dev))) {

		for_primary_ifa(in_dev) {

			if (ifa->ifa_scope != RT_SCOPE_LINK &&

			    ifa->ifa_scope <= scope) {

				addr = ifa->ifa_local;

		addr = in_dev_select_addr(in_dev, scope);

		if (addr)

			goto out_unlock;

	}

		} endfor_ifa(in_dev);

	}



	/* Not loopback addresses on loopback should be preferred

	   in this case. It is important that lo is the first interface
@@ -1249,14 +1257,10 @@ __be32 inet_select_addr(const struct net_device *dev, __be32 dst, int scope) 
		if (!in_dev)

			continue;



		for_primary_ifa(in_dev) {

			if (ifa->ifa_scope != RT_SCOPE_LINK &&

			    ifa->ifa_scope <= scope) {

				addr = ifa->ifa_local;

		addr = in_dev_select_addr(in_dev, scope);

		if (addr)

			goto out_unlock;

	}

		} endfor_ifa(in_dev);

	}

out_unlock:

	rcu_read_unlock();

	return addr;