From owner-svn-src-head@freebsd.org Mon Apr 25 05:22:37 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 38861B1C52D; Mon, 25 Apr 2016 05:22:37 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0604D1DE7; Mon, 25 Apr 2016 05:22:36 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3P5MahO011668; Mon, 25 Apr 2016 05:22:36 GMT (envelope-from sephe@FreeBSD.org) Received: (from sephe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3P5MaXY011667; Mon, 25 Apr 2016 05:22:36 GMT (envelope-from sephe@FreeBSD.org) Message-Id: <201604250522.u3P5MaXY011667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sephe set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau Date: Mon, 25 Apr 2016 05:22:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298569 - head/sys/dev/hyperv/vmbus X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Apr 2016 05:22:37 -0000 Author: sephe Date: Mon Apr 25 05:22:35 2016 New Revision: 298569 URL: https://svnweb.freebsd.org/changeset/base/298569 Log: hyperv/channel: Remove the unnecessary 'new' flag MFC after: 1 week Sponsored by: Microsoft OSTC Modified: head/sys/dev/hyperv/vmbus/hv_channel_mgmt.c Modified: head/sys/dev/hyperv/vmbus/hv_channel_mgmt.c ============================================================================== --- head/sys/dev/hyperv/vmbus/hv_channel_mgmt.c Mon Apr 25 04:58:14 2016 (r298568) +++ head/sys/dev/hyperv/vmbus/hv_channel_mgmt.c Mon Apr 25 05:22:35 2016 (r298569) @@ -174,13 +174,10 @@ hv_vmbus_free_vmbus_channel(hv_vmbus_cha static void vmbus_channel_process_offer(hv_vmbus_channel *new_channel) { - boolean_t f_new; hv_vmbus_channel* channel; int ret; uint32_t relid; - f_new = TRUE; - channel = NULL; relid = new_channel->offer_msg.child_rel_id; /* * Make sure this is a new offer @@ -196,14 +193,12 @@ vmbus_channel_process_offer(hv_vmbus_cha sizeof(hv_guid)) == 0 && memcmp(&channel->offer_msg.offer.interface_instance, &new_channel->offer_msg.offer.interface_instance, - sizeof(hv_guid)) == 0) { - f_new = FALSE; + sizeof(hv_guid)) == 0) break; - } } - if (f_new) { - /* Insert at tail */ + if (channel == NULL) { + /* Install the new primary channel */ TAILQ_INSERT_TAIL( &hv_vmbus_g_connection.channel_anchor, new_channel, @@ -213,7 +208,7 @@ vmbus_channel_process_offer(hv_vmbus_cha /*XXX add new channel to percpu_list */ - if (!f_new) { + if (channel != NULL) { /* * Check if this is a sub channel. */