igb: cleanup flow control configuration to make requested/current more clear

This patch cleans up the flow control configuration for igb to make it a
bit more readable in regards to what the requested and current modes are.
This should help with the maintainability of the current igb driver in
regards to flow control.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 12d8683c231e..fb3273517587 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1130,7 +1130,7 @@ void igb_reset(struct igb_adapter *adapter)
         }
         fc->pause_time = 0xFFFF;
         fc->send_xon = 1;
-        fc->type = fc->original_type;
+        fc->current_mode = fc->requested_mode;
 
         /* disable receive for all VFs and wait one second */
         if (adapter->vfs_allocated_count) {
@@ -1427,8 +1427,8 @@ static int __devinit igb_probe(struct pci_dev *pdev,
         hw->mac.autoneg = true;
         hw->phy.autoneg_advertised = 0x2f;
 
-        hw->fc.original_type = e1000_fc_default;
-        hw->fc.type = e1000_fc_default;
+        hw->fc.requested_mode = e1000_fc_default;
+        hw->fc.current_mode = e1000_fc_default;
 
         adapter->itr_setting = IGB_DEFAULT_ITR;
         adapter->itr = IGB_START_ITR;