3 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
index 287ee954448f..fa314b4a68c1 100644
--- a/drivers/net/e1000e/hw.h
+++ b/drivers/net/e1000e/hw.h
@@ -901,6 +901,7 @@ struct e1000_fc_info {
         u32 high_water;          /* Flow control high-water mark */
         u32 low_water;           /* Flow control low-water mark */
         u16 pause_time;          /* Flow control pause timer */
+        u16 refresh_time;        /* Flow control refresh timer */
         bool send_xon;           /* Flow control send XON */
         bool strict_ieee;        /* Strict IEEE mode */
         enum e1000_fc_mode current_mode; /* FC mode in effect */
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
index 8efe9a7cbaad..2b2cffc017be 100644
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@ -2823,6 +2823,8 @@ static s32 e1000_setup_link_ich8lan(struct e1000_hw *hw)
         ew32(FCTTV, hw->fc.pause_time);
         if ((hw->phy.type == e1000_phy_82578) ||
             (hw->phy.type == e1000_phy_82577)) {
+                ew32(FCRTV_PCH, hw->fc.refresh_time);
+
                 ret_val = hw->phy.ops.write_reg(hw,
                                              PHY_REG(BM_PORT_CTRL_PAGE, 27),
                                              hw->fc.pause_time);
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 16a03c553299..d1f60c570c0e 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -3134,6 +3134,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
                         fc->high_water = 0x5000;
                         fc->low_water  = 0x3000;
                 }
+                fc->refresh_time = 0x1000;
         } else {
                 if ((adapter->flags & FLAG_HAS_ERT) &&
                     (adapter->netdev->mtu > ETH_DATA_LEN))
@@ -3171,10 +3172,6 @@ void e1000e_reset(struct e1000_adapter *adapter)
         if (mac->ops.init_hw(hw))
                 e_err("Hardware Error\n");
 
-        /* additional part of the flow-control workaround above */
-        if (hw->mac.type == e1000_pchlan)
-                ew32(FCRTV_PCH, 0x1000);
-
         e1000_update_mng_vlan(adapter);
 
         /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */