diff options
| author | Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk> | 2017-08-17 17:58:24 +0100 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-08-17 19:47:27 +0200 |
| commit | 4a1b87aba448fae648bf17830379fde11060927b (patch) | |
| tree | 0f769693caf6f7210c6aece9d06e0c3f37fbc4ff /target/linux/generic/patches-4.4/704-phy-no-genphy-soft-reset.patch | |
| parent | cae20f64b555cfb76f74eb115b2d01fcb22ca462 (diff) | |
| download | upstream-4a1b87aba448fae648bf17830379fde11060927b.tar.gz upstream-4a1b87aba448fae648bf17830379fde11060927b.tar.bz2 upstream-4a1b87aba448fae648bf17830379fde11060927b.zip | |
kernel: update 4.4 to 4.4.83
Refresh patches.
Minor update 704-phy-no-genphy-soft-reset.patch which was partially
accepted upstream.
Compile-tested on ar71xx.
Runtime-tested on ar71xx.
Fixes the following vulnerabilities:
- CVE-2017-7533 (4.4.80)
- CVE-2017-1000111 (4.4.82)
- CVE-2017-1000112 (4.4.82)
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/generic/patches-4.4/704-phy-no-genphy-soft-reset.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/704-phy-no-genphy-soft-reset.patch | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/target/linux/generic/patches-4.4/704-phy-no-genphy-soft-reset.patch b/target/linux/generic/patches-4.4/704-phy-no-genphy-soft-reset.patch index d876187d7c..7cec6d3226 100644 --- a/target/linux/generic/patches-4.4/704-phy-no-genphy-soft-reset.patch +++ b/target/linux/generic/patches-4.4/704-phy-no-genphy-soft-reset.patch @@ -1,29 +1,11 @@ --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1213,7 +1213,7 @@ int genphy_config_init(struct phy_device - return 0; - } - --static int gen10g_soft_reset(struct phy_device *phydev) -+static int no_soft_reset(struct phy_device *phydev) - { - /* Do nothing for now */ - return 0; -@@ -1448,7 +1448,7 @@ static struct phy_driver genphy_driver[] - .phy_id = 0xffffffff, - .phy_id_mask = 0xffffffff, - .name = "Generic PHY", -- .soft_reset = genphy_soft_reset, -+ .soft_reset = no_soft_reset, - .config_init = genphy_config_init, - .features = PHY_GBIT_FEATURES | SUPPORTED_MII | - SUPPORTED_AUI | SUPPORTED_FIBRE | -@@ -1463,7 +1463,7 @@ static struct phy_driver genphy_driver[] +@@ -1465,7 +1465,7 @@ static struct phy_driver genphy_driver[] .phy_id = 0xffffffff, .phy_id_mask = 0xffffffff, .name = "Generic 10G PHY", - .soft_reset = gen10g_soft_reset, -+ .soft_reset = no_soft_reset, ++ .soft_reset = genphy_no_soft_reset, .config_init = gen10g_config_init, .features = 0, .config_aneg = gen10g_config_aneg, |