aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorBrian Haley <brian.haley@hp.com>2007-08-25 02:16:08 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:48:32 -0400
commite773e4faa19c54c2f32ddd16add2919588488bd9 (patch)
tree316395a9c687155362913ec1c588c0217233f67e /net/sctp
parent6f4fc423b96c8fdf6f5c8b8ad79b75b7fb5a5c59 (diff)
[IPV6]: Add v4mapped address inline
Add v4mapped address inline to avoid calls to ipv6_addr_type(). Signed-off-by: Brian Haley <brian.haley@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/ipv6.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 670fd2740b89..ec29b97dbab9 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -493,7 +493,7 @@ static int sctp_v6_cmp_addr(const union sctp_addr *addr1,
493 if (addr1->sa.sa_family != addr2->sa.sa_family) { 493 if (addr1->sa.sa_family != addr2->sa.sa_family) {
494 if (addr1->sa.sa_family == AF_INET && 494 if (addr1->sa.sa_family == AF_INET &&
495 addr2->sa.sa_family == AF_INET6 && 495 addr2->sa.sa_family == AF_INET6 &&
496 IPV6_ADDR_MAPPED == ipv6_addr_type(&addr2->v6.sin6_addr)) { 496 ipv6_addr_v4mapped(&addr2->v6.sin6_addr)) {
497 if (addr2->v6.sin6_port == addr1->v4.sin_port && 497 if (addr2->v6.sin6_port == addr1->v4.sin_port &&
498 addr2->v6.sin6_addr.s6_addr32[3] == 498 addr2->v6.sin6_addr.s6_addr32[3] ==
499 addr1->v4.sin_addr.s_addr) 499 addr1->v4.sin_addr.s_addr)
@@ -501,7 +501,7 @@ static int sctp_v6_cmp_addr(const union sctp_addr *addr1,
501 } 501 }
502 if (addr2->sa.sa_family == AF_INET && 502 if (addr2->sa.sa_family == AF_INET &&
503 addr1->sa.sa_family == AF_INET6 && 503 addr1->sa.sa_family == AF_INET6 &&
504 IPV6_ADDR_MAPPED == ipv6_addr_type(&addr1->v6.sin6_addr)) { 504 ipv6_addr_v4mapped(&addr1->v6.sin6_addr)) {
505 if (addr1->v6.sin6_port == addr2->v4.sin_port && 505 if (addr1->v6.sin6_port == addr2->v4.sin_port &&
506 addr1->v6.sin6_addr.s6_addr32[3] == 506 addr1->v6.sin6_addr.s6_addr32[3] ==
507 addr2->v4.sin_addr.s_addr) 507 addr2->v4.sin_addr.s_addr)