diff options
| author | Toomas Soome <tsoome@me.com> | 2019-01-18 20:47:42 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-04-10 08:56:52 +0300 |
| commit | 4138d84ec424020fc615b6aa351408e1efb98a38 (patch) | |
| tree | c04a22620a550364c2c06209d7c193d0dc9b1a38 /usr/src/uts/common/io/softmac | |
| parent | 95369d7b997316a0170a6c243bfbfc61d1258fb5 (diff) | |
| download | illumos-gate-4138d84ec424020fc615b6aa351408e1efb98a38.tar.gz | |
10646 softmac: NULL pointer errors
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/uts/common/io/softmac')
| -rw-r--r-- | usr/src/uts/common/io/softmac/softmac_fp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/common/io/softmac/softmac_fp.c b/usr/src/uts/common/io/softmac/softmac_fp.c index 44f7e94bee..8286ac4013 100644 --- a/usr/src/uts/common/io/softmac/softmac_fp.c +++ b/usr/src/uts/common/io/softmac/softmac_fp.c @@ -988,7 +988,7 @@ softmac_wput_data(softmac_upper_t *sup, mblk_t *mp) if (sup->su_mode != SOFTMAC_FASTPATH) dld_wput(sup->su_wq, mp); else - (void) softmac_fastpath_wput_data(sup, mp, NULL, 0); + (void) softmac_fastpath_wput_data(sup, mp, (uintptr_t)NULL, 0); } /*ARGSUSED*/ @@ -1019,7 +1019,7 @@ softmac_fastpath_wput_data(softmac_upper_t *sup, mblk_t *mp, uintptr_t f_hint, */ if (SOFTMAC_CANPUTNEXT(wq)) { putnext(wq, mp); - return (NULL); + return ((mac_tx_cookie_t)NULL); } if (sup->su_tx_busy) { |