diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 10:42:28 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-11 10:49:19 -0400 |
commit | da0e96315ca703ab6540cc7665549622f71c155f (patch) | |
tree | c1a135689a6f94266d51c1323f62f851826b05a9 /drivers/hv | |
parent | 407dd1644302ea78fa5d740e67a1c09677aa18a4 (diff) |
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>
Diffstat (limited to 'drivers/hv')
-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 |
3 files changed, 8 insertions, 9 deletions
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c index 41bf287baa1c..a2fc487d1422 100644 --- a/drivers/hv/channel_mgmt.c +++ b/drivers/hv/channel_mgmt.c | |||
@@ -114,7 +114,7 @@ static const uuid_le | |||
114 | 114 | ||
115 | 115 | ||
116 | /** | 116 | /** |
117 | * prep_negotiate_resp() - Create default response for Hyper-V Negotiate message | 117 | * vmbus_prep_negotiate_resp() - Create default response for Hyper-V Negotiate message |
118 | * @icmsghdrp: Pointer to msg header structure | 118 | * @icmsghdrp: Pointer to msg header structure |
119 | * @icmsg_negotiate: Pointer to negotiate message structure | 119 | * @icmsg_negotiate: Pointer to negotiate message structure |
120 | * @buf: Raw buffer channel data | 120 | * @buf: Raw buffer channel data |
@@ -128,9 +128,8 @@ static const uuid_le | |||
128 | * | 128 | * |
129 | * Mainly used by Hyper-V drivers. | 129 | * Mainly used by Hyper-V drivers. |
130 | */ | 130 | */ |
131 | void prep_negotiate_resp(struct icmsg_hdr *icmsghdrp, | 131 | void vmbus_prep_negotiate_resp(struct icmsg_hdr *icmsghdrp, |
132 | struct icmsg_negotiate *negop, | 132 | struct icmsg_negotiate *negop, u8 *buf) |
133 | u8 *buf) | ||
134 | { | 133 | { |
135 | if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { | 134 | if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { |
136 | icmsghdrp->icmsgsize = 0x10; | 135 | icmsghdrp->icmsgsize = 0x10; |
@@ -156,7 +155,7 @@ void prep_negotiate_resp(struct icmsg_hdr *icmsghdrp, | |||
156 | negop->icmsg_vercnt = 1; | 155 | negop->icmsg_vercnt = 1; |
157 | } | 156 | } |
158 | } | 157 | } |
159 | EXPORT_SYMBOL(prep_negotiate_resp); | 158 | EXPORT_SYMBOL_GPL(vmbus_prep_negotiate_resp); |
160 | 159 | ||
161 | /* | 160 | /* |
162 | * alloc_channel - Allocate and initialize a vmbus channel object | 161 | * alloc_channel - Allocate and initialize a vmbus channel object |
diff --git a/drivers/hv/hv_kvp.c b/drivers/hv/hv_kvp.c index 69c4c985daeb..89f52440fcf4 100644 --- a/drivers/hv/hv_kvp.c +++ b/drivers/hv/hv_kvp.c | |||
@@ -260,7 +260,7 @@ void hv_kvp_onchannelcallback(void *context) | |||
260 | sizeof(struct vmbuspipe_hdr)]; | 260 | sizeof(struct vmbuspipe_hdr)]; |
261 | 261 | ||
262 | if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { | 262 | if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { |
263 | prep_negotiate_resp(icmsghdrp, negop, recv_buffer); | 263 | vmbus_prep_negotiate_resp(icmsghdrp, negop, recv_buffer); |
264 | } else { | 264 | } else { |
265 | kvp_msg = (struct hv_kvp_msg *)&recv_buffer[ | 265 | kvp_msg = (struct hv_kvp_msg *)&recv_buffer[ |
266 | sizeof(struct vmbuspipe_hdr) + | 266 | sizeof(struct vmbuspipe_hdr) + |
diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c index e0e3a6d0244d..55d58f21e6d4 100644 --- a/drivers/hv/hv_util.c +++ b/drivers/hv/hv_util.c | |||
@@ -73,7 +73,7 @@ static void shutdown_onchannelcallback(void *context) | |||
73 | sizeof(struct vmbuspipe_hdr)]; | 73 | sizeof(struct vmbuspipe_hdr)]; |
74 | 74 | ||
75 | if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { | 75 | if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { |
76 | prep_negotiate_resp(icmsghdrp, negop, shut_txf_buf); | 76 | vmbus_prep_negotiate_resp(icmsghdrp, negop, shut_txf_buf); |
77 | } else { | 77 | } else { |
78 | shutdown_msg = | 78 | shutdown_msg = |
79 | (struct shutdown_msg_data *)&shut_txf_buf[ | 79 | (struct shutdown_msg_data *)&shut_txf_buf[ |
@@ -198,7 +198,7 @@ static void timesync_onchannelcallback(void *context) | |||
198 | sizeof(struct vmbuspipe_hdr)]; | 198 | sizeof(struct vmbuspipe_hdr)]; |
199 | 199 | ||
200 | if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { | 200 | if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { |
201 | prep_negotiate_resp(icmsghdrp, NULL, time_txf_buf); | 201 | vmbus_prep_negotiate_resp(icmsghdrp, NULL, time_txf_buf); |
202 | } else { | 202 | } else { |
203 | timedatap = (struct ictimesync_data *)&time_txf_buf[ | 203 | timedatap = (struct ictimesync_data *)&time_txf_buf[ |
204 | sizeof(struct vmbuspipe_hdr) + | 204 | sizeof(struct vmbuspipe_hdr) + |
@@ -237,7 +237,7 @@ static void heartbeat_onchannelcallback(void *context) | |||
237 | sizeof(struct vmbuspipe_hdr)]; | 237 | sizeof(struct vmbuspipe_hdr)]; |
238 | 238 | ||
239 | if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { | 239 | if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { |
240 | prep_negotiate_resp(icmsghdrp, NULL, hbeat_txf_buf); | 240 | vmbus_prep_negotiate_resp(icmsghdrp, NULL, hbeat_txf_buf); |
241 | } else { | 241 | } else { |
242 | heartbeat_msg = | 242 | heartbeat_msg = |
243 | (struct heartbeat_msg_data *)&hbeat_txf_buf[ | 243 | (struct heartbeat_msg_data *)&hbeat_txf_buf[ |