diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-04-05 12:46:44 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2018-04-05 12:46:44 +0000 |
commit | 7d4764a8704691712ae06535d720ae917acb4699 (patch) | |
tree | 5e93e2143f060a1eaf3377e68c06576199d912f5 /usr/src/uts/common/smbsrv/netrauth.h | |
parent | 414afefe58a0a3292d2689bd10360ebb4b505ca6 (diff) | |
download | illumos-joyent-7d4764a8704691712ae06535d720ae917acb4699.tar.gz |
[illumos-gate merge]
commit e89016e771abb6871cb08b54316d9a1a826a9193
9044 Need support for mpt_sas tri-mode parts
9045 Clean up mpt_sas compiler warnings
9046 mptsas_handle_topo_change can return without its locks held
9047 workaround SAS3408 firmware issue
commit 7d815089a43a963b49eaddf97e514194ec29805b
3328 smbutil view does't work with Win2008 and later
commit 3299f39fdcbdab4be7a9c70daa3873f2b78a398d
1575 untangle libmlrpc from SMB server
commit f78cdc34af236a6199dd9e21376f4a46348c0d56
9112 Improve allocation performance on high-end systems
Conflicts:
usr/src/uts/common/io/scsi/adapters/mpt_sas/mptsas_impl.c
Diffstat (limited to 'usr/src/uts/common/smbsrv/netrauth.h')
-rw-r--r-- | usr/src/uts/common/smbsrv/netrauth.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/smbsrv/netrauth.h b/usr/src/uts/common/smbsrv/netrauth.h index bc11d81e8c..b621e2da1a 100644 --- a/usr/src/uts/common/smbsrv/netrauth.h +++ b/usr/src/uts/common/smbsrv/netrauth.h @@ -33,7 +33,7 @@ */ #include <sys/types.h> -#include <smbsrv/wintypes.h> +#include <smb/wintypes.h> #include <smbsrv/netbios.h> #include <smbsrv/smbinfo.h> #include <netdb.h> |