i40e: remove chatty log messages
authorMitch Williams <mitch.a.williams@intel.com>
Thu, 28 Nov 2013 06:39:29 +0000 (06:39 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sat, 4 Jan 2014 04:53:38 +0000 (20:53 -0800)
Don't complain when we disable queues that are already disable, or
enable them when they're already enabled. This removes a bunch of bogus
log messages that we see at every VF reset.

Change-Id: Ia127be572abdccc48a53d8c43f8a07b8bb920de1
Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/i40e/i40e_main.c

index a109ae41a0dd58f2a609e436b3f38a9f2fe17519..82ed4363f6c85eb1086a85cb969207e05529481c 100644 (file)
@@ -2990,21 +2990,11 @@ static int i40e_vsi_control_tx(struct i40e_vsi *vsi, bool enable)
                } while (j-- && ((tx_reg >> I40E_QTX_ENA_QENA_REQ_SHIFT)
                               ^ (tx_reg >> I40E_QTX_ENA_QENA_STAT_SHIFT)) & 1);
 
-               if (enable) {
-                       /* is STAT set ? */
-                       if ((tx_reg & I40E_QTX_ENA_QENA_STAT_MASK)) {
-                               dev_info(&pf->pdev->dev,
-                                        "Tx %d already enabled\n", i);
-                               continue;
-                       }
-               } else {
-                       /* is !STAT set ? */
-                       if (!(tx_reg & I40E_QTX_ENA_QENA_STAT_MASK)) {
-                               dev_info(&pf->pdev->dev,
-                                        "Tx %d already disabled\n", i);
-                               continue;
-                       }
-               }
+               /* Skip if the queue is already in the requested state */
+               if (enable && (tx_reg & I40E_QTX_ENA_QENA_STAT_MASK))
+                       continue;
+               if (!enable && !(tx_reg & I40E_QTX_ENA_QENA_STAT_MASK))
+                       continue;
 
                /* turn on/off the queue */
                if (enable)