diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-18 12:01:18 +0200 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2018-10-19 10:00:48 +0200 |
| commit | dbd067013d05d240b44f1c75fffde6573f8c86bd (patch) | |
| tree | 082d63e7c6cd02af58a4e3188ddbf36a2f77ae31 /target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch | |
| parent | 486dc7583d8d6cc9f57d4bf9781ff5680181feee (diff) | |
| download | upstream-dbd067013d05d240b44f1c75fffde6573f8c86bd.tar.gz upstream-dbd067013d05d240b44f1c75fffde6573f8c86bd.tar.bz2 upstream-dbd067013d05d240b44f1c75fffde6573f8c86bd.zip | |
kernel: bump 4.9 to 4.9.134
Refreshed all patches.
Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch')
| -rw-r--r-- | target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch b/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch index 22d62f0960..ddc8290205 100644 --- a/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch +++ b/target/linux/sunxi/patches-4.9/0050-stmmac-form-4-10.patch @@ -3403,7 +3403,7 @@ --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c -@@ -292,6 +292,7 @@ stmmac_probe_config_dt(struct platform_d +@@ -291,6 +291,7 @@ stmmac_probe_config_dt(struct platform_d if (of_device_is_compatible(np, "snps,dwmac-4.00") || of_device_is_compatible(np, "snps,dwmac-4.10a")) { plat->has_gmac4 = 1; @@ -3411,7 +3411,7 @@ plat->pmt = 1; plat->tso_en = of_property_read_bool(np, "snps,tso"); } -@@ -303,21 +304,25 @@ stmmac_probe_config_dt(struct platform_d +@@ -302,21 +303,25 @@ stmmac_probe_config_dt(struct platform_d plat->force_sf_dma_mode = 1; } @@ -3452,7 +3452,7 @@ plat->force_thresh_dma_mode = of_property_read_bool(np, "snps,force_thresh_dma_mode"); if (plat->force_thresh_dma_mode) { plat->force_sf_dma_mode = 0; -@@ -445,9 +450,7 @@ static int stmmac_pltfr_suspend(struct d +@@ -444,9 +449,7 @@ static int stmmac_pltfr_suspend(struct d struct platform_device *pdev = to_platform_device(dev); ret = stmmac_suspend(dev); @@ -3463,7 +3463,7 @@ priv->plat->exit(pdev, priv->plat->bsp_priv); return ret; -@@ -466,9 +469,7 @@ static int stmmac_pltfr_resume(struct de +@@ -465,9 +468,7 @@ static int stmmac_pltfr_resume(struct de struct stmmac_priv *priv = netdev_priv(ndev); struct platform_device *pdev = to_platform_device(dev); |