Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259469
b: refs/heads/master
c: c0e2490
h: refs/heads/master
i:
  259467: 9f61716
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Jun 7, 2011
1 parent f1bb320 commit 2cb01f3
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 41 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: db545da77b197f580fe73a0a21a0982dd2def8e3
refs/heads/master: c0e2490fd42b0676e1ecb2d4ba7a6d0ec21d557b
38 changes: 0 additions & 38 deletions trunk/drivers/staging/hv/connection.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,44 +185,6 @@ int vmbus_connect(void)
return ret;
}

/*
* vmbus_disconnect -
* Sends a disconnect request on the partition service connection
*/
int vmbus_disconnect(void)
{
int ret = 0;
struct vmbus_channel_message_header *msg;

/* Make sure we are connected */
if (vmbus_connection.conn_state != CONNECTED)
return -1;

msg = kzalloc(sizeof(struct vmbus_channel_message_header), GFP_KERNEL);
if (!msg)
return -ENOMEM;

msg->msgtype = CHANNELMSG_UNLOAD;

ret = vmbus_post_msg(msg,
sizeof(struct vmbus_channel_message_header));
if (ret != 0)
goto cleanup;

free_pages((unsigned long)vmbus_connection.int_page, 0);
free_pages((unsigned long)vmbus_connection.monitor_pages, 1);

/* TODO: iterate thru the msg list and free up */
destroy_workqueue(vmbus_connection.work_queue);

vmbus_connection.conn_state = DISCONNECTED;

pr_info("hv_vmbus disconnected\n");

cleanup:
kfree(msg);
return ret;
}

/*
* relid2channel - Get the channel object given its
Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/staging/hv/hyperv_vmbus.h
Original file line number Diff line number Diff line change
Expand Up @@ -619,8 +619,6 @@ struct vmbus_channel *relid2channel(u32 relid);

int vmbus_connect(void);

int vmbus_disconnect(void);

int vmbus_post_msg(void *buffer, size_t buflen);

int vmbus_set_event(u32 child_relid);
Expand Down

0 comments on commit 2cb01f3

Please sign in to comment.