From 624038333cc8b9753aa708419ef700fe0fd2ffa3 Mon Sep 17 00:00:00 2001 From: Dan McDonald Date: Thu, 6 Mar 2014 09:46:56 -0500 Subject: [PATCH] 4596 Callers of ip_srcid_find_id() need to be more careful (mismerge) --- usr/src/uts/common/inet/ip/ip_srcid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/src/uts/common/inet/ip/ip_srcid.c b/usr/src/uts/common/inet/ip/ip_srcid.c index efb49f20e0..93fffec0f9 100644 --- a/usr/src/uts/common/inet/ip/ip_srcid.c +++ b/usr/src/uts/common/inet/ip/ip_srcid.c @@ -256,7 +256,7 @@ ip_srcid_find_id(uint_t id, in6_addr_t *addr, zoneid_t zoneid, * The caller tells us if it expects a v4mapped address. * Use it, along with the property of "addr" to set the rc. */ - if (IN6_IS_ADDR_V4MAPPED(addr)) + if (IN6_IS_ADDR_V4MAPPED(&smp->sm_addr)) rc = v4mapped; /* We want a v4mapped address. */ else rc = !v4mapped; /* We don't want a v4mapped address. */ -- 2.11.4.GIT