lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drivers: hv: Get rid of an unnecessary check in vmbus_prep_negotiate_resp()

Browse Source 
The vmbus_prep_negotiate_resp() is only invoked when we are negotiating
the version; so the current check in vmbus_prep_negotiate_resp()
is unnecessary. Get rid of it.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
K. Y. Srinivasan
2012-05-12 13:44:57 -07:00
committed by Greg Kroah-Hartman
parent 90394482b8
commit a360530012
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/hv/channel_mgmt.c
View File

@@ -56,30 +56,29 @@ struct vmbus_channel_message_table_entry {
void vmbus_prep_negotiate_resp(struct icmsg_hdr *icmsghdrp, void vmbus_prep_negotiate_resp(struct icmsg_hdr *icmsghdrp,
struct icmsg_negotiate *negop, u8 *buf) struct icmsg_negotiate *negop, u8 *buf)
{ {
if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { icmsghdrp->icmsgsize = 0x10;
icmsghdrp->icmsgsize = 0x10;
negop = (struct icmsg_negotiate *)&buf[ negop = (struct icmsg_negotiate *)&buf[
sizeof(struct vmbuspipe_hdr) + sizeof(struct vmbuspipe_hdr) +
sizeof(struct icmsg_hdr)]; sizeof(struct icmsg_hdr)];
if (negop->icframe_vercnt == 2 && if (negop->icframe_vercnt == 2 &&
negop->icversion_data[1].major == 3) { negop->icversion_data[1].major == 3) {
negop->icversion_data[0].major = 3; negop->icversion_data[0].major = 3;
negop->icversion_data[0].minor = 0; negop->icversion_data[0].minor = 0;
negop->icversion_data[1].major = 3; negop->icversion_data[1].major = 3;
negop->icversion_data[1].minor = 0; negop->icversion_data[1].minor = 0;
} else { } else {
negop->icversion_data[0].major = 1; negop->icversion_data[0].major = 1;
negop->icversion_data[0].minor = 0; negop->icversion_data[0].minor = 0;
negop->icversion_data[1].major = 1; negop->icversion_data[1].major = 1;
negop->icversion_data[1].minor = 0; negop->icversion_data[1].minor = 0;
}
negop->icframe_vercnt = 1;
negop->icmsg_vercnt = 1;
} }
negop->icframe_vercnt = 1;
negop->icmsg_vercnt = 1;
} }
EXPORT_SYMBOL_GPL(vmbus_prep_negotiate_resp); EXPORT_SYMBOL_GPL(vmbus_prep_negotiate_resp);
/* /*