commit: 3392e8d8bc97e63f4427475d804019f872df2572 Author: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> AuthorDate: Wed Jan 17 09:38:49 2018 +0000 Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> CommitDate: Wed Jan 17 09:38:49 2018 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=3392e8d8
removed patch e1000e: Separate signaling for link check/link up (upstreamed) 0000_README | 4 ---- 2400_e1000e_regression.patch | 40 ---------------------------------------- 2 files changed, 44 deletions(-) diff --git a/0000_README b/0000_README index 84f3396..045c7bd 100644 --- a/0000_README +++ b/0000_README @@ -115,10 +115,6 @@ Patch: 2300_enable-poweroff-on-Mac-Pro-11.patch From: http://kernel.ubuntu.com/git/ubuntu/ubuntu-xenial.git/patch/drivers/pci/quirks.c?id=5080ff61a438f3dd80b88b423e1a20791d8a774c Desc: Workaround to enable poweroff on Mac Pro 11. See bug #601964. -Patch: 2400_e1000e_regression.patch -From: https://bugzilla.kernel.org/show_bug.cgi?id=198047 -Desc: Regression in e1000e. See bug #641818. - Patch: 2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch From: https://bugzilla.redhat.com/show_bug.cgi?id=1260207#c5 Desc: Add UAS disable quirk. See bug #640082. diff --git a/2400_e1000e_regression.patch b/2400_e1000e_regression.patch deleted file mode 100644 index 9eba050..0000000 --- a/2400_e1000e_regression.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c -index d6d4ed7acf03..31277d3bb7dc 100644 ---- a/drivers/net/ethernet/intel/e1000e/ich8lan.c -+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c -@@ -1367,6 +1367,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) - * Checks to see of the link status of the hardware has changed. If a - * change in link status has been detected, then we read the PHY registers - * to get the current speed/duplex if link exists. -+ * -+ * Returns a negative error code (-E1000_ERR_*) or 0 (link down) or 1 (link -+ * up). - **/ - static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) - { -@@ -1382,7 +1385,7 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) - * Change or Rx Sequence Error interrupt. - */ - if (!mac->get_link_status) -- return 0; -+ return 1; - - /* First we want to see if the MII Status Register reports - * link. If so, then we want to get the current speed/duplex -@@ -1613,10 +1616,12 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) - * different link partner. - */ - ret_val = e1000e_config_fc_after_link_up(hw); -- if (ret_val) -+ if (ret_val) { - e_dbg("Error configuring flow control\n"); -+ return ret_val; -+ } - -- return ret_val; -+ return 1; - } - - static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter) --- -2.15.1
