1 files changed, 15 insertions, 5 deletions

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index f1cce5928e20..dce377b59b2c 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -2991,11 +2991,21 @@ static void e1000_setup_rctl(struct e1000_adapter *adapter)
         u32 rctl, rfctl;
         u32 pages = 0;
 
-        /* Workaround Si errata on PCHx - configure jumbo frame flow */
-        if ((hw->mac.type >= e1000_pch2lan) &&
-            (adapter->netdev->mtu > ETH_DATA_LEN) &&
-            e1000_lv_jumbo_workaround_ich8lan(hw, true))
-                e_dbg("failed to enable jumbo frame workaround mode\n");
+        /* Workaround Si errata on PCHx - configure jumbo frame flow.
+         * If jumbo frames not set, program related MAC/PHY registers
+         * to h/w defaults
+         */
+        if (hw->mac.type >= e1000_pch2lan) {
+                s32 ret_val;
+
+                if (adapter->netdev->mtu > ETH_DATA_LEN)
+                        ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, true);
+                else
+                        ret_val = e1000_lv_jumbo_workaround_ich8lan(hw, false);
+
+                if (ret_val)
+                        e_dbg("failed to enable|disable jumbo frame workaround mode\n");
+        }
 
         /* Program MC offset vector base */
         rctl = er32(RCTL);