Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354984
b: refs/heads/master
c: 37f7278
h: refs/heads/master
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Jan 17, 2013
1 parent bf98116 commit b019c5c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 29423b7e51a8ea4d687cf98c3a50f33c554be194
refs/heads/master: 37f7278b81a9ab9b76cf4d716ba420444ca4a616
9 changes: 9 additions & 0 deletions trunk/drivers/hv/connection.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/hyperv.h>
#include <linux/export.h>
#include <asm/hyperv.h>
#include "hyperv_vmbus.h"

Expand All @@ -54,6 +55,12 @@ struct vmbus_connection vmbus_connection = {

#define VERSION_INVAL -1

/*
* Negotiated protocol version with the host.
*/
__u32 vmbus_proto_version;
EXPORT_SYMBOL_GPL(vmbus_proto_version);

static __u32 vmbus_get_next_version(__u32 current_version)
{
switch (current_version) {
Expand Down Expand Up @@ -215,6 +222,8 @@ int vmbus_connect(void)
if (version == VERSION_INVAL)
goto cleanup;

vmbus_proto_version = version;
pr_info("Negotiated host information %d\n", version);
kfree(msginfo);
return 0;

Expand Down
6 changes: 6 additions & 0 deletions trunk/include/linux/hyperv.h
Original file line number Diff line number Diff line change
Expand Up @@ -1204,5 +1204,11 @@ int hv_kvp_init(struct hv_util_service *);
void hv_kvp_deinit(void);
void hv_kvp_onchannelcallback(void *);

/*
* Negotiated version with the Host.
*/

extern __u32 vmbus_proto_version;

#endif /* __KERNEL__ */
#endif /* _HYPERV_H */

0 comments on commit b019c5c

Please sign in to comment.