hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
YOSHIFUJI Hideaki 2007-11-14 15:55:29 +09:00 committed by David S. Miller
parent 294b4baf29
commit c1ee656ccb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/ipv6/addrconf.c
View File

@ -875,7 +875,7 @@ static inline int ipv6_saddr_preferred(int type)
} }
/* static matching label */ /* 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 * prefix (longest match) label
@ -910,7 +910,7 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
struct inet6_ifaddr *ifa_result = NULL; struct inet6_ifaddr *ifa_result = NULL;
int daddr_type = __ipv6_addr_type(daddr); int daddr_type = __ipv6_addr_type(daddr);
int daddr_scope = __ipv6_addr_src_scope(daddr_type); 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; struct net_device *dev;
memset(&hiscore, 0, sizeof(hiscore)); memset(&hiscore, 0, sizeof(hiscore));
@ -1083,11 +1083,13 @@ int ipv6_dev_get_saddr(struct net_device *daddr_dev,
/* Rule 6: Prefer matching label */ /* Rule 6: Prefer matching label */
if (hiscore.rule < 6) { 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.attrs |= IPV6_SADDR_SCORE_LABEL;
hiscore.rule++; 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; score.attrs |= IPV6_SADDR_SCORE_LABEL;
if (!(hiscore.attrs & IPV6_SADDR_SCORE_LABEL)) { if (!(hiscore.attrs & IPV6_SADDR_SCORE_LABEL)) {
score.rule = 6; score.rule = 6;