diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-12-12 12:21:44 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-12-12 12:21:44 +0000 |
| commit | 0fdac07978db62c0192855169f837f4ea73f27e1 (patch) | |
| tree | c22667d24e42ec8feaf6ce871707f71e464e51d1 /usr/src/uts/common/os/netstack.c | |
| parent | 41e2a941ad0108858475882f545b0f9adbe7b7b2 (diff) | |
| parent | 84fe1120bdf58601e40698ac798bbbcabfc8cfb8 (diff) | |
| download | illumos-joyent-0fdac07978db62c0192855169f837f4ea73f27e1.tar.gz | |
[illumos-gate merge]
commit 84fe1120bdf58601e40698ac798bbbcabfc8cfb8
8900 deadlock between netstack teardown and kstat read
commit 6e0609600611b03dde9cde82799da6d7b40d14be
8850 libresolv2: variable 'tvp' set but not used
commit bd64ab839d994fbc07f126ff254a4bf3c12524b7
8838 libxcurses: variable 'code' set but not used
commit fe054a6ca181843f102908c7e101f69bb5ea5b59
8814 nxge: variable 'ether_class' set but not used
Conflicts:
usr/src/uts/common/os/netstack.c
Diffstat (limited to 'usr/src/uts/common/os/netstack.c')
| -rw-r--r-- | usr/src/uts/common/os/netstack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/os/netstack.c b/usr/src/uts/common/os/netstack.c index 70337cca2f..8791bb06da 100644 --- a/usr/src/uts/common/os/netstack.c +++ b/usr/src/uts/common/os/netstack.c @@ -1080,7 +1080,7 @@ netstack_reap(void *arg) mutex_enter(&netstack_g_lock); found = B_FALSE; for (nsp = &netstack_head; *nsp != NULL; - nsp = &(*nsp)->netstack_next) { + nsp = &(*nsp)->netstack_next) { if (*nsp == ns) { *nsp = ns->netstack_next; ns->netstack_next = NULL; |