diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-03-10 11:51:49 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-03-10 11:51:49 +0000 |
| commit | 3f9f29b906943320199b9229c24a5fe59dc340d0 (patch) | |
| tree | a692758a1a376e6cb6c60438390da0c7376c6534 /usr/src/uts | |
| parent | 7986d0138f7b2fc2fe4a12dce758b443d9aa448f (diff) | |
| parent | 343622ca5a82ac99828cc46e04e1f962c09be0e8 (diff) | |
| download | illumos-joyent-3f9f29b906943320199b9229c24a5fe59dc340d0.tar.gz | |
[illumos-gate merge]
commit 343622ca5a82ac99828cc46e04e1f962c09be0e8
12346 need libm(3LIB) and libmvec(3LIB) manpages
commit ea7201620ceafab72b37e65bea4ec461dd27089d
12355 vnic_unicast_add() can return uninitialised diag value
commit c71ad1764a07b4be9b04c56fd0d199c0f547404a
12366 Want mdb typelist command
Conflicts:
usr/src/man/man3lib/Makefile
Diffstat (limited to 'usr/src/uts')
| -rw-r--r-- | usr/src/uts/common/io/mac/mac_client.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/io/vnic/vnic_dev.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/uts/common/io/mac/mac_client.c b/usr/src/uts/common/io/mac/mac_client.c index e26a028243..dcfb4803d6 100644 --- a/usr/src/uts/common/io/mac/mac_client.c +++ b/usr/src/uts/common/io/mac/mac_client.c @@ -23,6 +23,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2019 Joyent, Inc. * Copyright 2017 RackTop Systems. + * Copyright 2020 OmniOS Community Edition (OmniOSce) Association. */ /* @@ -1287,7 +1288,7 @@ mac_addr_random(mac_client_handle_t mch, uint_t prefix_len, prefix_len, addr_len - prefix_len); } - *diag = 0; + *diag = MAC_DIAG_NONE; return (0); } @@ -2551,6 +2552,8 @@ i_mac_unicast_add(mac_client_handle_t mch, uint8_t *mac_addr, uint16_t flags, */ ASSERT(!((mip->mi_state_flags & MIS_IS_VNIC) && (vid != VLAN_ID_NONE))); + *diag = MAC_DIAG_NONE; + /* * Can't unicast add if the client asked only for minimal datapath * setup. diff --git a/usr/src/uts/common/io/vnic/vnic_dev.c b/usr/src/uts/common/io/vnic/vnic_dev.c index 0bd0d8d104..d75db5f258 100644 --- a/usr/src/uts/common/io/vnic/vnic_dev.c +++ b/usr/src/uts/common/io/vnic/vnic_dev.c @@ -22,6 +22,7 @@ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2018 Joyent, Inc. * Copyright 2016 OmniTI Computer Consulting, Inc. All rights reserved. + * Copyright 2020 OmniOS Community Edition (OmniOSce) Association. */ #include <sys/types.h> @@ -198,7 +199,7 @@ vnic_unicast_add(vnic_t *vnic, vnic_mac_addr_type_t vnic_addr_type, uint8_t *mac_addr_arg, uint16_t flags, vnic_ioc_diag_t *diag, uint16_t vid, boolean_t req_hwgrp_flag) { - mac_diag_t mac_diag; + mac_diag_t mac_diag = MAC_DIAG_NONE; uint16_t mac_flags = 0; int err; uint_t addr_len; |