diff options
| author | Robert Mustacchi <rm@joyent.com> | 2016-04-19 20:07:47 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2016-04-20 00:51:17 +0000 |
| commit | 014aa34ffddb60cb77871187863f018108785bb2 (patch) | |
| tree | 28eb95882075d988066e69060f9564f6476b48b5 | |
| parent | 89331fe166ce218be0ffcfc1dd6339653f95b571 (diff) | |
| download | illumos-joyent-release-20160414.tar.gz | |
OS-5347 mismerge in mac_protect_init()release-20160414
Reviewed by: Cody Mello <melloc@joyent.com>
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
| -rw-r--r-- | usr/src/uts/common/io/mac/mac_protect.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/usr/src/uts/common/io/mac/mac_protect.c b/usr/src/uts/common/io/mac/mac_protect.c index 805b5d36f9..da83dc643e 100644 --- a/usr/src/uts/common/io/mac/mac_protect.c +++ b/usr/src/uts/common/io/mac/mac_protect.c @@ -2576,6 +2576,9 @@ mac_protect_init(mac_client_impl_t *mcip) sizeof (dhcpv6_addr_t), offsetof(dhcpv6_addr_t, da_node)); avl_create(&mcip->mci_v6_slaac_ip, compare_slaac_ip, sizeof (slaac_addr_t), offsetof(slaac_addr_t, sla_node)); + + if (mcip->mci_state_flags & MCIS_IS_VNIC) + mcip->mci_protect_flags |= MPT_FLAG_PROMISC_FILTERED; } void |