Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

YOSHIFUJI Hideaki and committed by
David S. Miller
c1ee656c 294b4baf

+6 -4
+6 -4
net/ipv6/addrconf.c
··· 875 875 } 876 876 877 877 /* static matching label */ 878 - static inline int ipv6_saddr_label(const struct in6_addr *addr, int type) 878 + static inline int ipv6_addr_label(const struct in6_addr *addr, int type) 879 879 { 880 880 /* 881 881 * prefix (longest match) label ··· 910 910 struct inet6_ifaddr *ifa_result = NULL; 911 911 int daddr_type = __ipv6_addr_type(daddr); 912 912 int daddr_scope = __ipv6_addr_src_scope(daddr_type); 913 - u32 daddr_label = ipv6_saddr_label(daddr, daddr_type); 913 + u32 daddr_label = ipv6_addr_label(daddr, daddr_type); 914 914 struct net_device *dev; 915 915 916 916 memset(&hiscore, 0, sizeof(hiscore)); ··· 1083 1083 1084 1084 /* Rule 6: Prefer matching label */ 1085 1085 if (hiscore.rule < 6) { 1086 - if (ipv6_saddr_label(&ifa_result->addr, hiscore.addr_type) == daddr_label) 1086 + if (ipv6_addr_label(&ifa_result->addr, 1087 + hiscore.addr_type) == daddr_label) 1087 1088 hiscore.attrs |= IPV6_SADDR_SCORE_LABEL; 1088 1089 hiscore.rule++; 1089 1090 } 1090 - if (ipv6_saddr_label(&ifa->addr, score.addr_type) == daddr_label) { 1091 + if (ipv6_addr_label(&ifa->addr, 1092 + score.addr_type) == daddr_label) { 1091 1093 score.attrs |= IPV6_SADDR_SCORE_LABEL; 1092 1094 if (!(hiscore.attrs & IPV6_SADDR_SCORE_LABEL)) { 1093 1095 score.rule = 6;