diff options
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 2400_e1000e-fix-e1000_check_for_copper_link_ich8lan-return-value.patch | 66 |
2 files changed, 0 insertions, 70 deletions
diff --git a/0000_README b/0000_README index 13b9a6ca..1c143d12 100644 --- a/0000_README +++ b/0000_README @@ -503,10 +503,6 @@ Patch: 1900_xfs-fix-suspend-to-memory.patch From: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/fs/xfs/xfs_trans_ail.c?id=18f1df4e00cea2eae41f3e5515b94d1e7127b2b6 Desc: xfs: Make xfsaild freezeable again. See bug #575034. -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.4/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: 2700_ThinkPad-30-brightness-control-fix.patch From: Seth Forshee <seth.forshee@canonical.com> Desc: ACPI: Disable Windows 8 compatibility for some Lenovo ThinkPads. 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 34557d04..00000000 --- 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 <bpoirier@suse.com> -Date: Mon, 11 Dec 2017 16:26:40 +0900 -Subject: e1000e: Fix e1000_check_for_copper_link_ich8lan return value. - -From: Benjamin Poirier <bpoirier@suse.com> - -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 <list@eworm.de> -Reported-by: Gabriel C <nix.or.die@gmail.com> -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 <bpoirier@suse.com> -Tested-by: Aaron Brown <aaron.f.brown@intel.com> -Tested-by: Christian Hesse <list@eworm.de> -Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- - 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 -@@ -1362,6 +1362,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) - { -@@ -1377,7 +1380,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 -@@ -1585,10 +1588,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) |