Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

K. Y. Srinivasan and committed by
Greg Kroah-Hartman
a3605300 90394482

+19 -20
+19 -20
drivers/hv/channel_mgmt.c
··· 56 56 void vmbus_prep_negotiate_resp(struct icmsg_hdr *icmsghdrp, 57 57 struct icmsg_negotiate *negop, u8 *buf) 58 58 { 59 - if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { 60 - icmsghdrp->icmsgsize = 0x10; 59 + icmsghdrp->icmsgsize = 0x10; 61 60 62 - negop = (struct icmsg_negotiate *)&buf[ 63 - sizeof(struct vmbuspipe_hdr) + 64 - sizeof(struct icmsg_hdr)]; 61 + negop = (struct icmsg_negotiate *)&buf[ 62 + sizeof(struct vmbuspipe_hdr) + 63 + sizeof(struct icmsg_hdr)]; 65 64 66 - if (negop->icframe_vercnt == 2 && 67 - negop->icversion_data[1].major == 3) { 68 - negop->icversion_data[0].major = 3; 69 - negop->icversion_data[0].minor = 0; 70 - negop->icversion_data[1].major = 3; 71 - negop->icversion_data[1].minor = 0; 72 - } else { 73 - negop->icversion_data[0].major = 1; 74 - negop->icversion_data[0].minor = 0; 75 - negop->icversion_data[1].major = 1; 76 - negop->icversion_data[1].minor = 0; 77 - } 78 - 79 - negop->icframe_vercnt = 1; 80 - negop->icmsg_vercnt = 1; 65 + if (negop->icframe_vercnt == 2 && 66 + negop->icversion_data[1].major == 3) { 67 + negop->icversion_data[0].major = 3; 68 + negop->icversion_data[0].minor = 0; 69 + negop->icversion_data[1].major = 3; 70 + negop->icversion_data[1].minor = 0; 71 + } else { 72 + negop->icversion_data[0].major = 1; 73 + negop->icversion_data[0].minor = 0; 74 + negop->icversion_data[1].major = 1; 75 + negop->icversion_data[1].minor = 0; 81 76 } 77 + 78 + negop->icframe_vercnt = 1; 79 + negop->icmsg_vercnt = 1; 82 80 } 81 + 83 82 EXPORT_SYMBOL_GPL(vmbus_prep_negotiate_resp); 84 83 85 84 /*