diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-30 12:10:42 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-01-30 12:10:42 +0000 |
| commit | f568e529ecc3881470a3ed4c5e4758eaf87d779b (patch) | |
| tree | 1bddce945034d59d2cf3f460c70062264b2583e6 /usr/src/uts | |
| parent | 0fc869936c6de9789e78eb9e102bd08d81162df3 (diff) | |
| parent | d1b7cae3ba116011f75268b837e07eac4891bc1d (diff) | |
| download | illumos-joyent-f568e529ecc3881470a3ed4c5e4758eaf87d779b.tar.gz | |
[illumos-gate merge]
commit d1b7cae3ba116011f75268b837e07eac4891bc1d
10137 smatch fixes for setuname
commit 9a25c41f5f79fbad25d7746f5a4e65423c7eddff
10139 smatch fixes for usr/src/cmd/stat
commit bf9b145b69c7f9e2ab076ee1ab9461cb6d527e64
10275 Kernel attempts to apply old erratum to AMD Threadripper 1950X
commit 589d67980300f18e46919b854a2fdf644ee5fa09
10320 qede_gld.c uses assignment, means equality
commit 84d9cd0f02f7b6d7963dcb4a84148c3b2aaba7c5
10317 iconv_modules is building with -I/usr/include
Diffstat (limited to 'usr/src/uts')
| -rw-r--r-- | usr/src/uts/common/io/qede/qede_gld.c | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/io/qede/qede_version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/io/qede/qede_gld.c b/usr/src/uts/common/io/qede/qede_gld.c index a75bd0debd..4bca690225 100644 --- a/usr/src/uts/common/io/qede/qede_gld.c +++ b/usr/src/uts/common/io/qede/qede_gld.c @@ -1165,7 +1165,7 @@ qede_multicast(qede_t *qede, boolean_t flag, const uint8_t *ptr_mcaddr) qede->params.multi_promisc_fl = B_FALSE; } else { if ((qede->params.multi_promisc_fl == B_FALSE) && - (qede->params.promisc_fl = B_FALSE)) { + (qede->params.promisc_fl == B_FALSE)) { ret = qede_set_filter_rx_mode(qede, QEDE_FILTER_RX_MODE_MULTI_PROMISC); } diff --git a/usr/src/uts/common/io/qede/qede_version.h b/usr/src/uts/common/io/qede/qede_version.h index 54678600c9..8af00d182e 100644 --- a/usr/src/uts/common/io/qede/qede_version.h +++ b/usr/src/uts/common/io/qede/qede_version.h @@ -39,6 +39,6 @@ #define MAJVERSION 8 #define MINVERSION 1 -#define REVVERSION 23 +#define REVVERSION 24 #endif /* !_QEDE_VERSION_H */ |