diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-19 12:07:49 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-05-19 12:07:49 +0000 |
commit | 3817aef5460600089dfc2425a47c170ab4cce9e4 (patch) | |
tree | 73c5ac47d6ca43c532100c0f5e2d8e58f7f19728 /usr/src/uts/common/io/simnet | |
parent | b0c683a03f7c07cd7ab962acc1dcfef6ba4f78a3 (diff) | |
parent | d5b4c61b9474779079c9ef8650d04dd7c8207a06 (diff) | |
download | illumos-joyent-release-20200521.tar.gz |
[illumos-gate merge]release-20200521
commit d5b4c61b9474779079c9ef8650d04dd7c8207a06
12732 Update Intel microcode to 20200508
commit c61a1653a4d73dbc950dac7d96350fd6cb517486
12676 want better offloads for vnics
12677 simnet has bogus mi_tx_cksum_flags
12678 mac_tx() is too eager to emulate hardware offloads
commit f13f199891d2a0440db0361743dd73527f565e89
12729 bootadm set-menu timeout crashes without timeout value
commit c039d8138bcc82c8082abc5560e0293afb7994cf
12741 Fix "more then" typo in dlopen(3c)
commit 109b65249647da8f2f4306cd9b3d2800b05fd59b
12744 gfx_private: bitmap_cons_clear 8-bit mode is using wrong color
commit 3382f241dd77fdfc4a9c4b03092e328924cd0c65
12707 Port OpenZFS Coverity Fixes
commit 0c268761780011e1de45099cf76b2ee464ea8f50
12733 loader: autoboot_timeout greater than 10 is not shown
Conflicts:
usr/src/boot/sys/boot/forth/menu.4th
usr/src/pkg/manifests/system-test-nettest.mf
usr/src/test/net-tests/config/Makefile
usr/src/test/net-tests/runfiles/default.run
usr/src/test/net-tests/tests/forwarding/README
usr/src/test/net-tests/tests/forwarding/ip_forwarding.ksh
usr/src/test/net-tests/tests/net_common.ksh
usr/src/uts/common/io/mac/mac.c
usr/src/uts/common/io/mac/mac_client.c
usr/src/uts/common/io/mac/mac_sched.c
usr/src/uts/common/io/mac/mac_util.c
usr/src/uts/common/io/simnet/simnet.c
Diffstat (limited to 'usr/src/uts/common/io/simnet')
-rw-r--r-- | usr/src/uts/common/io/simnet/simnet.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr/src/uts/common/io/simnet/simnet.c b/usr/src/uts/common/io/simnet/simnet.c index efce703cb7..7fb48c90e4 100644 --- a/usr/src/uts/common/io/simnet/simnet.c +++ b/usr/src/uts/common/io/simnet/simnet.c @@ -693,7 +693,7 @@ simnet_rx(void *arg) /* Check for valid packet header */ if (mac_header_info(sdev->sd_mh, mp, &hdr_info) != 0) { - freemsg(mp); + mac_drop_pkt(mp, "invalid L2 header"); sdev->sd_stats.recv_errors++; goto rx_done; } @@ -754,7 +754,7 @@ simnet_m_tx(void *arg, mblk_t *mp_chain) if ((sdev_rx = sdev->sd_peer_dev) == NULL) { /* Discard packets when no peer exists */ rw_exit(&simnet_dev_lock); - freemsgchain(mp_chain); + mac_drop_chain(mp_chain, "no peer"); return (NULL); } @@ -771,14 +771,14 @@ simnet_m_tx(void *arg, mblk_t *mp_chain) */ if (!simnet_thread_ref(sdev_rx)) { rw_exit(&simnet_dev_lock); - freemsgchain(mp_chain); + mac_drop_chain(mp_chain, "simnet peer dev not ready"); return (NULL); } rw_exit(&simnet_dev_lock); if (!simnet_thread_ref(sdev)) { simnet_thread_unref(sdev_rx); - freemsgchain(mp_chain); + mac_drop_chain(mp_chain, "simnet dev not ready"); return (NULL); } @@ -798,7 +798,7 @@ simnet_m_tx(void *arg, mblk_t *mp_chain) mp_new = allocb(size, BPRI_HI); if (mp_new == NULL) { sdev->sd_stats.xmit_errors++; - freemsg(mp); + mac_drop_pkt(mp, "allocb failed"); continue; } bzero(mp_new->b_wptr, size); @@ -814,7 +814,7 @@ simnet_m_tx(void *arg, mblk_t *mp_chain) /* Pullup packet into a single mblk */ if ((nmp = msgpullup(mp, -1)) == NULL) { sdev->sd_stats.xmit_errors++; - freemsg(mp); + mac_drop_pkt(mp, "msgpullup failed"); continue; } else { mac_hcksum_clone(mp, nmp); @@ -824,8 +824,8 @@ simnet_m_tx(void *arg, mblk_t *mp_chain) /* Hold reference for taskq receive processing per-pkt */ if (!simnet_thread_ref(sdev_rx)) { - freemsg(mp); - freemsgchain(mpnext); + mac_drop_pkt(mp, "failed to get thread ref"); + mac_drop_chain(mpnext, "failed to get thread ref"); break; } |