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

Commit c1ee656c authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[IPV6] ADDRCONF: Rename ipv6_saddr_label() to ipv6_addr_label(). 



This patch renames ipv6_saddr_label() to ipv6_addr_label() because
address label is used for both of source address and destination
address.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 294b4baf

net/ipv6/addrconf.c

+6 −4
Original line number Diff line number Diff line
@@ -875,7 +875,7 @@ static inline int ipv6_saddr_preferred(int type) 
}



/* static matching label */

static inline int ipv6_saddr_label(const struct in6_addr *addr, int type)

static inline int ipv6_addr_label(const struct in6_addr *addr, int type)

{

 /*

  * 	prefix (longest match)	label
@@ -910,7 +910,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev, 
	struct inet6_ifaddr *ifa_result = NULL;

	int daddr_type = __ipv6_addr_type(daddr);

	int daddr_scope = __ipv6_addr_src_scope(daddr_type);

	u32 daddr_label = ipv6_saddr_label(daddr, daddr_type);

	u32 daddr_label = ipv6_addr_label(daddr, daddr_type);

	struct net_device *dev;



	memset(&hiscore, 0, sizeof(hiscore));
@@ -1083,11 +1083,13 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev, 


			/* Rule 6: Prefer matching label */

			if (hiscore.rule < 6) {

				if (ipv6_saddr_label(&ifa_result->addr, hiscore.addr_type) == daddr_label)

				if (ipv6_addr_label(&ifa_result->addr,

						    hiscore.addr_type) == daddr_label)

					hiscore.attrs |= IPV6_SADDR_SCORE_LABEL;

				hiscore.rule++;

			}

			if (ipv6_saddr_label(&ifa->addr, score.addr_type) == daddr_label) {

			if (ipv6_addr_label(&ifa->addr,

					    score.addr_type) == daddr_label) {

				score.attrs |= IPV6_SADDR_SCORE_LABEL;

				if (!(hiscore.attrs & IPV6_SADDR_SCORE_LABEL)) {

					score.rule = 6;