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>

diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c
index 9ffbfc575a0c1d14b451c9cc304d119dcd3c9069..6c8c4d34093064ac65cad16ea8cbfc191fde053e 100644 (file)
--- a/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@ -56,30 +56,29 @@ struct vmbus_channel_message_table_entry {
 void vmbus_prep_negotiate_resp(struct icmsg_hdr *icmsghdrp,
                               struct icmsg_negotiate *negop, u8 *buf)
 {
-       if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
-               icmsghdrp->icmsgsize = 0x10;
-
-               negop = (struct icmsg_negotiate *)&buf[
-                       sizeof(struct vmbuspipe_hdr) +
-                       sizeof(struct icmsg_hdr)];
-
-               if (negop->icframe_vercnt == 2 &&
-                  negop->icversion_data[1].major == 3) {
-                       negop->icversion_data[0].major = 3;
-                       negop->icversion_data[0].minor = 0;
-                       negop->icversion_data[1].major = 3;
-                       negop->icversion_data[1].minor = 0;
-               } else {
-                       negop->icversion_data[0].major = 1;
-                       negop->icversion_data[0].minor = 0;
-                       negop->icversion_data[1].major = 1;
-                       negop->icversion_data[1].minor = 0;
-               }
-
-               negop->icframe_vercnt = 1;
-               negop->icmsg_vercnt = 1;
+       icmsghdrp->icmsgsize = 0x10;
+
+       negop = (struct icmsg_negotiate *)&buf[
+               sizeof(struct vmbuspipe_hdr) +
+               sizeof(struct icmsg_hdr)];
+
+       if (negop->icframe_vercnt == 2 &&
+          negop->icversion_data[1].major == 3) {
+               negop->icversion_data[0].major = 3;
+               negop->icversion_data[0].minor = 0;
+               negop->icversion_data[1].major = 3;
+               negop->icversion_data[1].minor = 0;
+       } else {
+               negop->icversion_data[0].major = 1;
+               negop->icversion_data[0].minor = 0;
+               negop->icversion_data[1].major = 1;
+               negop->icversion_data[1].minor = 0;
        }
+
+       negop->icframe_vercnt = 1;
+       negop->icmsg_vercnt = 1;
 }
+
 EXPORT_SYMBOL_GPL(vmbus_prep_negotiate_resp);
 
 /*