diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 08:42:28 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 08:49:19 -0600 |
| commit | da0e96315ca703ab6540cc7665549622f71c155f (patch) | |
| tree | c1a135689a6f94266d51c1323f62f851826b05a9 | |
| parent | 407dd1644302ea78fa5d740e67a1c09677aa18a4 (diff) | |
| download | op-kernel-dev-da0e96315ca703ab6540cc7665549622f71c155f.zip op-kernel-dev-da0e96315ca703ab6540cc7665549622f71c155f.tar.gz | |
hv: rename prep_negotiate_resp() to vmbus_prep_negotiate_resp()
It's a global symbol, so properly prefix it and use the proper EXPORT
value as well.
Cc: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/hv/channel_mgmt.c | 9 | ||||
| -rw-r--r-- | drivers/hv/hv_kvp.c | 2 | ||||
| -rw-r--r-- | drivers/hv/hv_util.c | 6 | ||||
| -rw-r--r-- | include/linux/hyperv.h | 4 |
4 files changed, 10 insertions, 11 deletions
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c index 41bf287..a2fc487 100644 --- a/drivers/hv/channel_mgmt.c +++ b/drivers/hv/channel_mgmt.c @@ -114,7 +114,7 @@ static const uuid_le /** - * prep_negotiate_resp() - Create default response for Hyper-V Negotiate message + * vmbus_prep_negotiate_resp() - Create default response for Hyper-V Negotiate message * @icmsghdrp: Pointer to msg header structure * @icmsg_negotiate: Pointer to negotiate message structure * @buf: Raw buffer channel data @@ -128,9 +128,8 @@ static const uuid_le * * Mainly used by Hyper-V drivers. */ -void prep_negotiate_resp(struct icmsg_hdr *icmsghdrp, - struct icmsg_negotiate *negop, - u8 *buf) +void vmbus_prep_negotiate_resp(struct icmsg_hdr *icmsghdrp, + struct icmsg_negotiate *negop, u8 *buf) { if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { icmsghdrp->icmsgsize = 0x10; @@ -156,7 +155,7 @@ void prep_negotiate_resp(struct icmsg_hdr *icmsghdrp, negop->icmsg_vercnt = 1; } } -EXPORT_SYMBOL(prep_negotiate_resp); +EXPORT_SYMBOL_GPL(vmbus_prep_negotiate_resp); /* * alloc_channel - Allocate and initialize a vmbus channel object diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c index 69c4c98..89f5244 100644 --- a/drivers/hv/hv_kvp.c +++ b/drivers/hv/hv_kvp.c @@ -260,7 +260,7 @@ void hv_kvp_onchannelcallback(void *context) sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { - prep_negotiate_resp(icmsghdrp, negop, recv_buffer); + vmbus_prep_negotiate_resp(icmsghdrp, negop, recv_buffer); } else { kvp_msg = (struct hv_kvp_msg *)&recv_buffer[ sizeof(struct vmbuspipe_hdr) + diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c index e0e3a6d..55d58f2 100644 --- a/drivers/hv/hv_util.c +++ b/drivers/hv/hv_util.c @@ -73,7 +73,7 @@ static void shutdown_onchannelcallback(void *context) sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { - prep_negotiate_resp(icmsghdrp, negop, shut_txf_buf); + vmbus_prep_negotiate_resp(icmsghdrp, negop, shut_txf_buf); } else { shutdown_msg = (struct shutdown_msg_data *)&shut_txf_buf[ @@ -198,7 +198,7 @@ static void timesync_onchannelcallback(void *context) sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { - prep_negotiate_resp(icmsghdrp, NULL, time_txf_buf); + vmbus_prep_negotiate_resp(icmsghdrp, NULL, time_txf_buf); } else { timedatap = (struct ictimesync_data *)&time_txf_buf[ sizeof(struct vmbuspipe_hdr) + @@ -237,7 +237,7 @@ static void heartbeat_onchannelcallback(void *context) sizeof(struct vmbuspipe_hdr)]; if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { - prep_negotiate_resp(icmsghdrp, NULL, hbeat_txf_buf); + vmbus_prep_negotiate_resp(icmsghdrp, NULL, hbeat_txf_buf); } else { heartbeat_msg = (struct heartbeat_msg_data *)&hbeat_txf_buf[ diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 4c8414a..98a57a5 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -960,7 +960,7 @@ struct hyperv_service_callback { void (*callback) (void *context); }; -extern void prep_negotiate_resp(struct icmsg_hdr *, - struct icmsg_negotiate *, u8 *); +extern void vmbus_prep_negotiate_resp(struct icmsg_hdr *, + struct icmsg_negotiate *, u8 *); #endif /* _HYPERV_H */ |
