Date: Mon, 11 Apr 2016 06:59:13 +0000 (UTC) From: Sepherosa Ziehau <sephe@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297811 - head/sys/dev/hyperv/netvsc Message-ID: <201604110659.u3B6xDku033746@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sephe Date: Mon Apr 11 06:59:13 2016 New Revision: 297811 URL: https://svnweb.freebsd.org/changeset/base/297811 Log: hyperv/hn: Remove unnecessary NULL checks Submitted by: Jun Su <junsu microsoft com> Reviewed by: sephe MFC after: 1 week Sponsored by: Microsoft OSTC Differential Revision: https://reviews.freebsd.org/D5905 Modified: head/sys/dev/hyperv/netvsc/hv_net_vsc.c head/sys/dev/hyperv/netvsc/hv_rndis_filter.c Modified: head/sys/dev/hyperv/netvsc/hv_net_vsc.c ============================================================================== --- head/sys/dev/hyperv/netvsc/hv_net_vsc.c Mon Apr 11 06:37:50 2016 (r297810) +++ head/sys/dev/hyperv/netvsc/hv_net_vsc.c Mon Apr 11 06:59:13 2016 (r297811) @@ -742,10 +742,8 @@ cleanup: * Free the packet buffers on the netvsc device packet queue. * Release other resources. */ - if (net_dev) { - sema_destroy(&net_dev->channel_init_sema); - free(net_dev, M_NETVSC); - } + sema_destroy(&net_dev->channel_init_sema); + free(net_dev, M_NETVSC); return (NULL); } Modified: head/sys/dev/hyperv/netvsc/hv_rndis_filter.c ============================================================================== --- head/sys/dev/hyperv/netvsc/hv_rndis_filter.c Mon Apr 11 06:37:50 2016 (r297810) +++ head/sys/dev/hyperv/netvsc/hv_rndis_filter.c Mon Apr 11 06:59:13 2016 (r297811) @@ -405,8 +405,7 @@ hv_rf_send_offload_request(struct hv_dev } cleanup: - if (request) - hv_put_rndis_request(rndis_dev, request); + hv_put_rndis_request(rndis_dev, request); return (ret); } @@ -907,10 +906,8 @@ hv_rf_halt_device(rndis_device *device) } device->state = RNDIS_DEV_UNINITIALIZED; - - if (request != NULL) { - hv_put_rndis_request(device, request); - } + + hv_put_rndis_request(device, request); return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604110659.u3B6xDku033746>