commit: 35e89b0ce98a5afdc28e76282abd13f795ba05ee Author: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> AuthorDate: Wed Jan 17 10:10:42 2018 +0000 Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org> CommitDate: Wed Jan 17 10:10:42 2018 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=35e89b0c
removed patch e1000e: Separate signaling for link check/link up (upstreamed) 0000_README | 4 -- ...heck_for_copper_link_ich8lan-return-value.patch | 66 ---------------------- 2 files changed, 70 deletions(-) diff --git a/0000_README b/0000_README index e18eed7..3c2946d 100644 --- a/0000_README +++ b/0000_README @@ -375,10 +375,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-fix-e1000_check_for_copper_link_ich8lan-return-value.patch -From: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-4.9/e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch -Desc: Fix link is not ready / does not come up on e1000e ICH8 network interfaces. See bug #641818. - Patch: 2900_dev-root-proc-mount-fix.patch From: https://bugs.gentoo.org/show_bug.cgi?id=438380 Desc: Ensure that /dev/root doesn't appear in /proc/mounts when bootint without an initramfs. diff --git a/2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch b/2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch deleted file mode 100644 index 95ab72d..0000000 --- a/2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4110e02eb45ea447ec6f5459c9934de0a273fb91 Mon Sep 17 00:00:00 2001 -From: Benjamin Poirier <[email protected]> -Date: Mon, 11 Dec 2017 16:26:40 +0900 -Subject: e1000e: Fix e1000_check_for_copper_link_ich8lan return value. - -From: Benjamin Poirier <[email protected]> - -commit 4110e02eb45ea447ec6f5459c9934de0a273fb91 upstream. - -e1000e_check_for_copper_link() and e1000_check_for_copper_link_ich8lan() -are the two functions that may be assigned to mac.ops.check_for_link when -phy.media_type == e1000_media_type_copper. Commit 19110cfbb34d ("e1000e: -Separate signaling for link check/link up") changed the meaning of the -return value of check_for_link for copper media but only adjusted the first -function. This patch adjusts the second function likewise. - -Reported-by: Christian Hesse <[email protected]> -Reported-by: Gabriel C <[email protected]> -Link: https://bugzilla.kernel.org/show_bug.cgi?id=198047 -Fixes: 19110cfbb34d ("e1000e: Separate signaling for link check/link up") -Signed-off-by: Benjamin Poirier <[email protected]> -Tested-by: Aaron Brown <[email protected]> -Tested-by: Christian Hesse <[email protected]> -Signed-off-by: Jeff Kirsher <[email protected]> -Signed-off-by: Greg Kroah-Hartman <[email protected]> - ---- - drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - ---- a/drivers/net/ethernet/intel/e1000e/ich8lan.c -+++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c -@@ -1364,6 +1364,9 @@ out: - * 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) - { -@@ -1379,7 +1382,7 @@ static s32 e1000_check_for_copper_link_i - * 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 -@@ -1611,10 +1614,12 @@ static s32 e1000_check_for_copper_link_i - * 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)
