From 69649a1b45ee0ab7ab3de350dc75f89d867c174c Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 26 Jun 2017 11:22:11 +0200 Subject: kernel: update kernel 4.9 to 4.9.34 - Refreshed all patches - Adapted 1 (0031-mtd-add-SMEM-parser-for-QCOM-platforms.patch) Compile tested on: brcm2708, cns3xxx, imx6 Run tested on: brcm2708, cns3xxx, imx6 Signed-off-by: Koen Vandeputte [Compile and run tested on brcm2708] Signed-off-by: Stijn Tintel --- .../patches-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 2 +- .../generic/patches-4.9/702-phy_add_aneg_done_function.patch | 2 +- .../703-phy-add-detach-callback-to-struct-phy_driver.patch | 2 +- .../linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch | 6 +++--- target/linux/generic/patches-4.9/721-phy_packets.patch | 8 ++++---- target/linux/generic/patches-4.9/930-crashlog.patch | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'target/linux/generic/patches-4.9') diff --git a/target/linux/generic/patches-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/patches-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 99d029ce68..4a81e751dd 100644 --- a/target/linux/generic/patches-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/patches-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau return 0; --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1748,6 +1748,8 @@ struct net_device { +@@ -1749,6 +1749,8 @@ struct net_device { struct netdev_hw_addr_list mc; struct netdev_hw_addr_list dev_addrs; diff --git a/target/linux/generic/patches-4.9/702-phy_add_aneg_done_function.patch b/target/linux/generic/patches-4.9/702-phy_add_aneg_done_function.patch index d38212da7b..5f71be60b8 100644 --- a/target/linux/generic/patches-4.9/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/patches-4.9/702-phy_add_aneg_done_function.patch @@ -15,7 +15,7 @@ --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1247,6 +1247,9 @@ int genphy_update_link(struct phy_device +@@ -1267,6 +1267,9 @@ int genphy_update_link(struct phy_device { int status; diff --git a/target/linux/generic/patches-4.9/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/patches-4.9/703-phy-add-detach-callback-to-struct-phy_driver.patch index c9e9b695ea..68b60ac4a8 100644 --- a/target/linux/generic/patches-4.9/703-phy-add-detach-callback-to-struct-phy_driver.patch +++ b/target/linux/generic/patches-4.9/703-phy-add-detach-callback-to-struct-phy_driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -983,6 +983,9 @@ void phy_detach(struct phy_device *phyde +@@ -1001,6 +1001,9 @@ void phy_detach(struct phy_device *phyde struct mii_bus *bus; int i; diff --git a/target/linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch b/target/linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch index 8ea34e28e3..6672bbe8a2 100644 --- a/target/linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch +++ b/target/linux/generic/patches-4.9/704-phy-no-genphy-soft-reset.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1465,7 +1465,7 @@ int genphy_config_init(struct phy_device +@@ -1485,7 +1485,7 @@ int genphy_config_init(struct phy_device return 0; } @@ -9,7 +9,7 @@ { /* Do nothing for now */ return 0; -@@ -1704,7 +1704,7 @@ static struct phy_driver genphy_driver[] +@@ -1724,7 +1724,7 @@ static struct phy_driver genphy_driver[] .phy_id = 0xffffffff, .phy_id_mask = 0xffffffff, .name = "Generic PHY", @@ -18,7 +18,7 @@ .config_init = genphy_config_init, .features = PHY_GBIT_FEATURES | SUPPORTED_MII | SUPPORTED_AUI | SUPPORTED_FIBRE | -@@ -1718,7 +1718,7 @@ static struct phy_driver genphy_driver[] +@@ -1738,7 +1738,7 @@ static struct phy_driver genphy_driver[] .phy_id = 0xffffffff, .phy_id_mask = 0xffffffff, .name = "Generic 10G PHY", diff --git a/target/linux/generic/patches-4.9/721-phy_packets.patch b/target/linux/generic/patches-4.9/721-phy_packets.patch index 5b4ff07d99..717aba8ffb 100644 --- a/target/linux/generic/patches-4.9/721-phy_packets.patch +++ b/target/linux/generic/patches-4.9/721-phy_packets.patch @@ -1,6 +1,6 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1397,6 +1397,7 @@ enum netdev_priv_flags { +@@ -1398,6 +1398,7 @@ enum netdev_priv_flags { IFF_RXFH_CONFIGURED = 1<<25, IFF_PHONY_HEADROOM = 1<<26, IFF_MACSEC = 1<<27, @@ -8,7 +8,7 @@ }; #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN -@@ -1426,6 +1427,7 @@ enum netdev_priv_flags { +@@ -1427,6 +1428,7 @@ enum netdev_priv_flags { #define IFF_TEAM IFF_TEAM #define IFF_RXFH_CONFIGURED IFF_RXFH_CONFIGURED #define IFF_MACSEC IFF_MACSEC @@ -16,7 +16,7 @@ /** * struct net_device - The DEVICE structure. -@@ -1712,6 +1714,11 @@ struct net_device { +@@ -1713,6 +1715,11 @@ struct net_device { const struct ndisc_ops *ndisc_ops; #endif @@ -28,7 +28,7 @@ const struct header_ops *header_ops; unsigned int flags; -@@ -1779,6 +1786,10 @@ struct net_device { +@@ -1780,6 +1787,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif diff --git a/target/linux/generic/patches-4.9/930-crashlog.patch b/target/linux/generic/patches-4.9/930-crashlog.patch index a2e2180706..e904138435 100644 --- a/target/linux/generic/patches-4.9/930-crashlog.patch +++ b/target/linux/generic/patches-4.9/930-crashlog.patch @@ -33,7 +33,7 @@ depends on BROKEN || !FRV --- a/kernel/Makefile +++ b/kernel/Makefile -@@ -112,6 +112,7 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o +@@ -113,6 +113,7 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o obj-$(CONFIG_MEMBARRIER) += membarrier.o obj-$(CONFIG_HAS_IOMEM) += memremap.o -- cgit v1.2.3