aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorSepherosa Ziehau <sephe@FreeBSD.org>2016-04-25 05:22:35 +0000
committerSepherosa Ziehau <sephe@FreeBSD.org>2016-04-25 05:22:35 +0000
commit84e83c0abdfc61c771ebeab0eaa8d0ec228c6341 (patch)
tree49fcea2f1234007048921414d7e73e0936535575 /sys/dev
parent625dc68a9ece450e194c6c9c8e00fcf3acc2f7e9 (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/hyperv/vmbus/hv_channel_mgmt.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/hyperv/vmbus/hv_channel_mgmt.c b/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
index d761e0165169..e66723332b07 100644
--- a/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
+++ b/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
@@ -174,13 +174,10 @@ hv_vmbus_free_vmbus_channel(hv_vmbus_channel* channel)
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_channel *new_channel)
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_channel *new_channel)
/*XXX add new channel to percpu_list */
- if (!f_new) {
+ if (channel != NULL) {
/*
* Check if this is a sub channel.
*/