domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump 4.9 to 4.9.118

Browse Source 
Refreshed all patches.

Compile-tested on: ar71xx
Runtime-tested on: ar71xx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
(backported from commit f7036a34ac)
This commit is contained in:
Koen Vandeputte
2018-08-07 10:33:52 +02:00
committed by Jo-Philipp Wich
parent 0990dfc9ce
commit ca3174e4e9
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/kernel-version.mk
View File

@@ -2,10 +2,12 @@
LINUX_RELEASE?=1 LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .117 LINUX_VERSION-4.4 = .121
LINUX_VERSION-4.9 = .118
LINUX_VERSION-4.14 = .60 LINUX_VERSION-4.14 = .60
LINUX_KERNEL_HASH-4.9.117 = 8232ea326ac5784d71baa09c0cd7806a2674f8449c0be73e2ae341e6880279b0 LINUX_KERNEL_HASH-4.4.121 = 44a88268b5088dc326b30c9b9133ac35a9a200b636b7268d08f32abeae6ca729
LINUX_KERNEL_HASH-4.9.118 = 7df789e40c6040cd6f6e34326f477b389ab7eaf2bb04940fca4bbe5e733add57
LINUX_KERNEL_HASH-4.14.60 = 6ce143258fba2e1f543ff56802e047d7d3a741f746b9c947dd088d4a2873b295 LINUX_KERNEL_HASH-4.14.60 = 6ce143258fba2e1f543ff56802e047d7d3a741f746b9c947dd088d4a2873b295
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))

2
target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
View File

@@ -795,7 +795,7 @@
--- a/net/ipv4/tcp_input.c --- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c
@@ -3906,14 +3906,16 @@ static bool tcp_parse_aligned_timestamp( @@ -3910,14 +3910,16 @@ static bool tcp_parse_aligned_timestamp(
{ {
const __be32 *ptr = (const __be32 *)(th + 1); const __be32 *ptr = (const __be32 *)(th + 1);

2
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
View File

@@ -1379,7 +1379,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
*/ */
--- a/drivers/net/xen-netfront.c --- a/drivers/net/xen-netfront.c
+++ b/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c
@@ -1064,7 +1064,7 @@ err: @@ -1065,7 +1065,7 @@ err:
if (work_done < budget) { if (work_done < budget) {
int more_to_do = 0; int more_to_do = 0;

27
target/linux/sunxi/patches-4.9/0053-stmmac-form-4-13.patch
View File

@@ -1619,18 +1619,23 @@
int phy_addr; int phy_addr;
}; };
-struct stmmac_pci_info { +struct stmmac_pci_dmi_data {
+ const struct stmmac_pci_func_data *func;
+ size_t nfuncs;
+};
+
struct stmmac_pci_info {
- struct pci_dev *pdev; - struct pci_dev *pdev;
- int (*setup)(struct plat_stmmacenet_data *plat, - int (*setup)(struct plat_stmmacenet_data *plat,
- struct stmmac_pci_info *info); - struct stmmac_pci_info *info);
- struct stmmac_pci_dmi_data *dmi; - struct stmmac_pci_dmi_data *dmi;
+struct stmmac_pci_dmi_data { + int (*setup)(struct pci_dev *pdev, struct plat_stmmacenet_data *plat);
+ const struct stmmac_pci_func_data *func;
+ size_t nfuncs;
}; };
-static int stmmac_pci_find_phy_addr(struct stmmac_pci_info *info) -static int stmmac_pci_find_phy_addr(struct stmmac_pci_info *info)
-{ +static int stmmac_pci_find_phy_addr(struct pci_dev *pdev,
+ const struct dmi_system_id *dmi_list)
{
- const char *name = dmi_get_system_info(DMI_BOARD_NAME); - const char *name = dmi_get_system_info(DMI_BOARD_NAME);
- const char *asset_tag = dmi_get_system_info(DMI_BOARD_ASSET_TAG); - const char *asset_tag = dmi_get_system_info(DMI_BOARD_ASSET_TAG);
- unsigned int func = PCI_FUNC(info->pdev->devfn); - unsigned int func = PCI_FUNC(info->pdev->devfn);
@@ -1642,10 +1647,7 @@
- */ - */
- if (!name) - if (!name)
- return 1; - return 1;
+struct stmmac_pci_info { -
+ int (*setup)(struct pci_dev *pdev, struct plat_stmmacenet_data *plat);
+};
- for (dmi = info->dmi; dmi->name && *dmi->name; dmi++) { - for (dmi = info->dmi; dmi->name && *dmi->name; dmi++) {
- if (!strcmp(dmi->name, name) && dmi->func == func) { - if (!strcmp(dmi->name, name) && dmi->func == func) {
- /* If asset tag is provided, match on it as well. */ - /* If asset tag is provided, match on it as well. */
@@ -1654,9 +1656,6 @@
- return dmi->phy_addr; - return dmi->phy_addr;
- } - }
- } - }
+static int stmmac_pci_find_phy_addr(struct pci_dev *pdev,
+ const struct dmi_system_id *dmi_list)
+{
+ const struct stmmac_pci_func_data *func_data; + const struct stmmac_pci_func_data *func_data;
+ const struct stmmac_pci_dmi_data *dmi_data; + const struct stmmac_pci_dmi_data *dmi_data;
+ const struct dmi_system_id *dmi_id; + const struct dmi_system_id *dmi_id;
@@ -1852,9 +1851,9 @@
pci_enable_msi(pdev); pci_enable_msi(pdev);
@@ -270,14 +304,21 @@ static void stmmac_pci_remove(struct pci @@ -306,14 +340,21 @@ static int stmmac_pci_resume(struct devi
static SIMPLE_DEV_PM_OPS(stmmac_pm_ops, stmmac_suspend, stmmac_resume); static SIMPLE_DEV_PM_OPS(stmmac_pm_ops, stmmac_pci_suspend, stmmac_pci_resume);
-#define STMMAC_VENDOR_ID 0x700 -#define STMMAC_VENDOR_ID 0x700
+/* synthetic ID, no official vendor */ +/* synthetic ID, no official vendor */