2 files changed, 23 insertions, 18 deletions

diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c
index 30719f591fb2..d09351c56a1f 100644
--- a/drivers/net/benet/be_cmds.c
+++ b/drivers/net/benet/be_cmds.c
@@ -106,14 +106,24 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
                         netdev_stats_update(adapter);
                         adapter->stats_cmd_sent = false;
                 }
-        } else if ((compl_status != MCC_STATUS_NOT_SUPPORTED) &&
-                   (compl->tag0 != OPCODE_COMMON_NTWK_MAC_QUERY)) {
-                extd_status = (compl->status >> CQE_STATUS_EXTD_SHIFT) &
-                                CQE_STATUS_EXTD_MASK;
-                dev_warn(&adapter->pdev->dev,
-                "Error in cmd completion - opcode %d, compl %d, extd %d\n",
-                        compl->tag0, compl_status, extd_status);
+        } else {
+                if (compl_status == MCC_STATUS_NOT_SUPPORTED ||
+                        compl_status == MCC_STATUS_ILLEGAL_REQUEST)
+                        goto done;
+
+                if (compl_status == MCC_STATUS_UNAUTHORIZED_REQUEST) {
+                        dev_warn(&adapter->pdev->dev, "This domain(VM) is not "
+                                "permitted to execute this cmd (opcode %d)\n",
+                                compl->tag0);
+                } else {
+                        extd_status = (compl->status >> CQE_STATUS_EXTD_SHIFT) &
+                                        CQE_STATUS_EXTD_MASK;
+                        dev_err(&adapter->pdev->dev, "Cmd (opcode %d) failed:"
+                                "status %d, extd-status %d\n",
+                                compl->tag0, compl_status, extd_status);
+                }
         }
+done:
         return compl_status;
 }
 
diff --git a/drivers/net/benet/be_cmds.h b/drivers/net/benet/be_cmds.h
index d08289e21f61..f0d745742d9d 100644
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@ -51,17 +51,12 @@ struct be_mcc_wrb {
 
 /* Completion Status */
 enum {
-        MCC_STATUS_SUCCESS = 0x0,
-/* The client does not have sufficient privileges to execute the command */
-        MCC_STATUS_INSUFFICIENT_PRIVILEGES = 0x1,
-/* A parameter in the command was invalid. */
-        MCC_STATUS_INVALID_PARAMETER = 0x2,
-/* There are insufficient chip resources to execute the command */
-        MCC_STATUS_INSUFFICIENT_RESOURCES = 0x3,
-/* The command is completing because the queue was getting flushed */
-        MCC_STATUS_QUEUE_FLUSHING = 0x4,
-/* The command is completing with a DMA error */
-        MCC_STATUS_DMA_FAILED = 0x5,
+        MCC_STATUS_SUCCESS = 0,
+        MCC_STATUS_FAILED = 1,
+        MCC_STATUS_ILLEGAL_REQUEST = 2,
+        MCC_STATUS_ILLEGAL_FIELD = 3,
+        MCC_STATUS_INSUFFICIENT_BUFFER = 4,
+        MCC_STATUS_UNAUTHORIZED_REQUEST = 5,
         MCC_STATUS_NOT_SUPPORTED = 66
 };