From f9974786551750ea47cd1faf1e739d6a39ec2dc7 Mon Sep 17 00:00:00 2001 From: Stijn Tintel Date: Wed, 6 Dec 2017 23:51:31 +0100 Subject: kernel: bump 4.9 to 4.9.67 Refresh patches. Remove upstreamed patches: - generic/190-1-5-e1000e-Fix-error-path-in-link-detection.patch - generic/190-3-5-e1000e-Fix-return-value-test.patch - generic/190-4-5-e1000e-Separate-signaling-for-link-check-link-up.patch - generic/190-5-5-e1000e-Avoid-receiver-overrun-interrupt-bursts.patch - ramips/0102-MIPS-ralink-Fix-MT7628-pinmux.patch - ramips/0103-MIPS-ralink-Fix-typo-in-mt7628-pinmux-function Update patches that no longer apply: - layerscape/815-spi-support-layerscape.patch - ramips/0099-pci-mt7620.patch Compile-tested on ar71xx, brcm2708/bcm2708, octeon and x86/64. Runtime-tested on ar71xx, brcm2708/bcm2708, octeon and x86/64. Signed-off-by: Stijn Tintel --- ...5-e1000e-Fix-error-path-in-link-detection.patch | 52 ---------------------- 1 file changed, 52 deletions(-) delete mode 100644 target/linux/generic/pending-4.9/190-1-5-e1000e-Fix-error-path-in-link-detection.patch (limited to 'target/linux/generic/pending-4.9/190-1-5-e1000e-Fix-error-path-in-link-detection.patch') diff --git a/target/linux/generic/pending-4.9/190-1-5-e1000e-Fix-error-path-in-link-detection.patch b/target/linux/generic/pending-4.9/190-1-5-e1000e-Fix-error-path-in-link-detection.patch deleted file mode 100644 index 8ed91db6ef..0000000000 --- a/target/linux/generic/pending-4.9/190-1-5-e1000e-Fix-error-path-in-link-detection.patch +++ /dev/null @@ -1,52 +0,0 @@ -From patchwork Fri Jul 21 18:36:23 2017 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [1/5] e1000e: Fix error path in link detection -From: Benjamin Poirier -X-Patchwork-Id: 9857487 -Message-Id: <20170721183627.13373-1-bpoirier@suse.com> -To: Jeff Kirsher -Cc: Lennart Sorensen , - intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, - linux-kernel@vger.kernel.org -Date: Fri, 21 Jul 2017 11:36:23 -0700 - -In case of error from e1e_rphy(), the loop will exit early and "success" -will be set to true erroneously. - -Signed-off-by: Benjamin Poirier ---- - drivers/net/ethernet/intel/e1000e/phy.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - ---- a/drivers/net/ethernet/intel/e1000e/phy.c -+++ b/drivers/net/ethernet/intel/e1000e/phy.c -@@ -1744,6 +1744,7 @@ s32 e1000e_phy_has_link_generic(struct e - s32 ret_val = 0; - u16 i, phy_status; - -+ *success = false; - for (i = 0; i < iterations; i++) { - /* Some PHYs require the MII_BMSR register to be read - * twice due to the link bit being sticky. No harm doing -@@ -1763,16 +1764,16 @@ s32 e1000e_phy_has_link_generic(struct e - ret_val = e1e_rphy(hw, MII_BMSR, &phy_status); - if (ret_val) - break; -- if (phy_status & BMSR_LSTATUS) -+ if (phy_status & BMSR_LSTATUS) { -+ *success = true; - break; -+ } - if (usec_interval >= 1000) - msleep(usec_interval / 1000); - else - udelay(usec_interval); - } - -- *success = (i < iterations); -- - return ret_val; - } - -- cgit v1.2.3