From: VMware, Inc <>
Date: Mon, 26 Jul 2010 18:08:24 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.07.25-280253~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=753a6d5ed66f600814067d2c7f22e2b2965dedf3;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/foundryMsg/foundryMsg.c b/open-vm-tools/lib/foundryMsg/foundryMsg.c
index c3185ee1f..db05899e8 100644
--- a/open-vm-tools/lib/foundryMsg/foundryMsg.c
+++ b/open-vm-tools/lib/foundryMsg/foundryMsg.c
@@ -125,8 +125,7 @@ static const VixCommandInfo vixCommandInfoTable[] = {
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_UPGRADE_VIRTUAL_HARDWARE,
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
-   VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_SET_NIC_BANDWIDTH,
-                           VIX_COMMAND_CATEGORY_PRIVILEGED),
+   VIX_DEFINE_UNUSED_COMMAND,
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_CREATE_DISK,
                            VIX_COMMAND_CATEGORY_PRIVILEGED),
    VIX_DEFINE_COMMAND_INFO(VIX_COMMAND_CREATE_FLOPPY,
diff --git a/open-vm-tools/lib/include/vixCommands.h b/open-vm-tools/lib/include/vixCommands.h
index 72fdb3a36..79629901c 100644
--- a/open-vm-tools/lib/include/vixCommands.h
+++ b/open-vm-tools/lib/include/vixCommands.h
@@ -338,48 +338,6 @@ struct VixMsgPowerOpRequest {
 VixMsgPowerOpRequest;
 
 
-
-/*
- * **********************************************************
- * Set NIC request. The response is just a generic
- * response header (it has no body).
- */
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgNICBandwidth {
-   Bool        validNICNum;
-   int32       nicNum;
-   char        pvnGUID[64];
-
-   uint32      totalBandwidth;
-   uint32      maxSendBandwidth;
-   uint32      maxReceiveBandwidth;
-
-   uint32      packetLossPattern;
-   uint32      packetLossRate;
-   uint32      packetLossMinBurstDuration;
-   uint32      packetLossMaxBurstDuration;
-
-   uint32      minLatency;
-   uint32      maxLatency;
-
-   uint32      options;
-}
-#include "vmware_pack_end.h"
-VixMsgNICBandwidth;
-   
-
-typedef
-#include "vmware_pack_begin.h"
-struct VixMsgSetNICBandwidthRequest {
-   VixCommandRequestHeader header;
-   VixMsgNICBandwidth      nicSettings;
-}
-#include "vmware_pack_end.h"
-VixMsgSetNICBandwidthRequest;
-
-
-
 /*
  * **********************************************************
  * Get/Set Properties Request
@@ -451,6 +409,29 @@ struct VixMsgConfigurationObjectType {
 #include "vmware_pack_end.h"
 VixMsgConfigurationObjectType;
 
+typedef
+#include "vmware_pack_begin.h"
+struct VixMsgNICBandwidth {
+   Bool        validNICNum;
+   int32       nicNum;
+   char        pvnGUID[64];
+
+   uint32      totalBandwidth;
+   uint32      maxSendBandwidth;
+   uint32      maxReceiveBandwidth;
+
+   uint32      packetLossPattern;
+   uint32      packetLossRate;
+   uint32      packetLossMinBurstDuration;
+   uint32      packetLossMaxBurstDuration;
+
+   uint32      minLatency;
+   uint32      maxLatency;
+
+   uint32      options;
+}
+#include "vmware_pack_end.h"
+VixMsgNICBandwidth;
 
 typedef
 #include "vmware_pack_begin.h"