mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
9ce7aa325e
* Refreshed patches. * Patches made redundant by changes upstream: - target/linux/ramips/patches-4.14/0036-mtd-fix-cfi-cmdset-0002-erase-status-check.patch * Patches accepted upstream: - target/linux/apm821xx/patches-4.14/020-0001-crypto-crypto4xx-remove-bad-list_del.patch - target/linux/apm821xx/patches-4.14/020-0011-crypto-crypto4xx-fix-crypto4xx_build_pdr-crypto4xx_b.patch - target/linux/brcm63xx/patches-4.14/001-4.15-08-bcm63xx_enet-correct-clock-usage.patch - target/linux/brcm63xx/patches-4.14/001-4.15-09-bcm63xx_enet-do-not-write-to-random-DMA-channel-on-B.patch - target/linux/generic/backport-4.14/080-net-convert-sock.sk_wmem_alloc-from-atomic_t-to-refc.patch - target/linux/generic/pending-4.14/900-gen_stats-fix-netlink-stats-padding.patch The ext4 regression introduced in 4.14.55 has been fixed by 4.14.60 (commit f547aa20b4f61662ad3e1a2040bb3cc5778f19b0). Fixes the following CVEs: - CVE-2018-10876 - CVE-2018-10877 - CVE-2018-10879 - CVE-2018-10880 - CVE-2018-10881 - CVE-2018-10882 - CVE-2018-10883 Thanks to Stijn Tintel for the CVE list :-). Compile-tested on: ramips/mt7621, x86/64 Run-tested on: ramips/mt7621, x86/64 Signed-off-by: Stijn Segers <foss@volatilesystems.org>
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 883dc66755313e133a787eba4dfde313fe33525b Mon Sep 17 00:00:00 2001
|
|
From: Russell King <rmk+kernel@armlinux.org.uk>
|
|
Date: Fri, 14 Apr 2017 16:41:55 +0100
|
|
Subject: sfp: use netdev sfp_bus for start/stop
|
|
|
|
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|
---
|
|
drivers/net/phy/phylink.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/phy/phylink.c
|
|
+++ b/drivers/net/phy/phylink.c
|
|
@@ -757,8 +757,8 @@ void phylink_start(struct phylink *pl)
|
|
clear_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
|
|
phylink_run_resolve(pl);
|
|
|
|
- if (pl->sfp_bus)
|
|
- sfp_upstream_start(pl->sfp_bus);
|
|
+ if (pl->netdev->sfp_bus)
|
|
+ sfp_upstream_start(pl->netdev->sfp_bus);
|
|
if (pl->phydev)
|
|
phy_start(pl->phydev);
|
|
}
|
|
@@ -770,8 +770,8 @@ void phylink_stop(struct phylink *pl)
|
|
|
|
if (pl->phydev)
|
|
phy_stop(pl->phydev);
|
|
- if (pl->sfp_bus)
|
|
- sfp_upstream_stop(pl->sfp_bus);
|
|
+ if (pl->netdev->sfp_bus)
|
|
+ sfp_upstream_stop(pl->netdev->sfp_bus);
|
|
|
|
set_bit(PHYLINK_DISABLE_STOPPED, &pl->phylink_disable_state);
|
|
queue_work(system_power_efficient_wq, &pl->resolve);
|