]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
e1000e: i219 - k1 workaround for LPT is not required for SPT
authorYanir Lubetkin <yanirx.lubetkin@intel.com>
Tue, 9 Jun 2015 22:16:03 +0000 (01:16 +0300)
committerBrian Maly <brian.maly@oracle.com>
Fri, 4 Sep 2015 20:56:36 +0000 (16:56 -0400)
Orabug: 21792108

In SPT hardware does not require this driver workaround.
Removed the conditional that caused K1 workaround execution on SPT.

Signed-off-by: Yanir Lubetkin <yanirx.lubetkin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 352f8ead753402d6c0496cb83b902128925459eb)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/intel/e1000e/ich8lan.c

index 3f5b8cb48512551fd41973981c106d511dea2c73..91a5a0ae9cd73932648492ce532b0e1260f1419c 100644 (file)
@@ -1489,8 +1489,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
        if ((hw->adapter->pdev->device == E1000_DEV_ID_PCH_LPTLP_I218_LM) ||
            (hw->adapter->pdev->device == E1000_DEV_ID_PCH_LPTLP_I218_V) ||
            (hw->adapter->pdev->device == E1000_DEV_ID_PCH_I218_LM3) ||
-           (hw->adapter->pdev->device == E1000_DEV_ID_PCH_I218_V3) ||
-           (hw->mac.type == e1000_pch_spt)) {
+           (hw->adapter->pdev->device == E1000_DEV_ID_PCH_I218_V3)) {
                ret_val = e1000_k1_workaround_lpt_lp(hw, link);
                if (ret_val)
                        return ret_val;