Re: [LEDE-DEV] [PATCH] ramips: fix mt7620 sdhci OF match variable name
On 24/02/18 18:59, Marek Behún wrote:
The variable rt288x_wdt_match is not event present in the file the
patch is creating, 4 lines above the variable is called
mt7620_sdhci_match instead. Seems like someone forgot to change
name of the variable when copying the OF definition code from watchdog
driver.
Signed-off-by: Marek Behun
oh dear, you found a real nice copy pasta gem there :-D
---
.../patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch | 2 +-
.../patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
b/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
index d3a088b736..b0d635f87f 100644
---
a/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
+++
b/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
@@ -4748,7 +4748,7 @@ Signed-off-by: John Crispin
+ { .compatible = "ralink,mt7620-sdhci" },
+ {},
+};
-+MODULE_DEVICE_TABLE(of, rt288x_wdt_match);
++MODULE_DEVICE_TABLE(of, mt7620_sdhci_match);
+
+static struct platform_driver mt_msdc_driver = {
+.probe = msdc_drv_probe,
diff --git
a/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
b/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
index 004ac239db..5559ed8eab 100644
---
a/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
+++
b/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
@@ -4748,7 +4748,7 @@ Signed-off-by: John Crispin
+ { .compatible = "ralink,mt7620-sdhci" },
+ {},
+};
-+MODULE_DEVICE_TABLE(of, rt288x_wdt_match);
++MODULE_DEVICE_TABLE(of, mt7620_sdhci_match);
+
+static struct platform_driver mt_msdc_driver = {
+.probe = msdc_drv_probe,
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] ramips: fix mt7620 sdhci OF match variable name
The variable rt288x_wdt_match is not event present in the file the
patch is creating, 4 lines above the variable is called
mt7620_sdhci_match instead. Seems like someone forgot to change
name of the variable when copying the OF definition code from watchdog
driver.
Signed-off-by: Marek Behun
---
.../patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch | 2 +-
.../patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
b/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
index d3a088b736..b0d635f87f 100644
---
a/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
+++
b/target/linux/ramips/patches-4.14/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
@@ -4748,7 +4748,7 @@ Signed-off-by: John Crispin
+ { .compatible = "ralink,mt7620-sdhci" },
+ {},
+};
-+MODULE_DEVICE_TABLE(of, rt288x_wdt_match);
++MODULE_DEVICE_TABLE(of, mt7620_sdhci_match);
+
+static struct platform_driver mt_msdc_driver = {
+.probe = msdc_drv_probe,
diff --git
a/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
b/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
index 004ac239db..5559ed8eab 100644
---
a/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
+++
b/target/linux/ramips/patches-4.9/0046-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
@@ -4748,7 +4748,7 @@ Signed-off-by: John Crispin
+ { .compatible = "ralink,mt7620-sdhci" },
+ {},
+};
-+MODULE_DEVICE_TABLE(of, rt288x_wdt_match);
++MODULE_DEVICE_TABLE(of, mt7620_sdhci_match);
+
+static struct platform_driver mt_msdc_driver = {
+.probe = msdc_drv_probe,
--
2.16.1
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] netifd: support DHCP sendopts as list options
Support config in the form of
add_list sendopts=router:10.10.10.2
add_list sendopts=nissrv:20.20.20.2
add_list sendopts=0x7D:abba
This allows to configure sendopts having white spaces as option value
Signed-off-by: Hans Dedecker
---
package/network/config/netifd/Makefile | 2 +-
package/network/config/netifd/files/lib/netifd/proto/dhcp.sh | 12 +++-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/package/network/config/netifd/Makefile
b/package/network/config/netifd/Makefile
index d2210e7c2e..d62b60ad98 100644
--- a/package/network/config/netifd/Makefile
+++ b/package/network/config/netifd/Makefile
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=netifd
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
index 385cfc3974..afcfba9f49 100755
--- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
@@ -16,7 +16,7 @@ proto_dhcp_init_config() {
proto_config_add_string 'reqopts:list(string)'
proto_config_add_boolean 'defaultreqopts:bool'
proto_config_add_string iface6rd
- proto_config_add_string sendopts
+ proto_config_add_array 'sendopts:list(string)'
proto_config_add_boolean delegate
proto_config_add_string zone6rd
proto_config_add_string zone
@@ -25,21 +25,23 @@ proto_dhcp_init_config() {
proto_config_add_boolean classlessroute
}
+proto_dhcp_add_sendopts() {
+ [ -n "$1" ] && append "$3" "-x $1"
+}
+
proto_dhcp_setup() {
local config="$1"
local iface="$2"
local ipaddr hostname clientid vendorid broadcast release reqopts
defaultreqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes
classlessroute
- json_get_vars ipaddr hostname clientid vendorid broadcast release
reqopts defaultreqopts iface6rd sendopts delegate zone6rd zone mtu6rd
customroutes classlessroute
+ json_get_vars ipaddr hostname clientid vendorid broadcast release
reqopts defaultreqopts iface6rd delegate zone6rd zone mtu6rd customroutes
classlessroute
local opt dhcpopts
for opt in $reqopts; do
append dhcpopts "-O $opt"
done
- for opt in $sendopts; do
- append dhcpopts "-x $opt"
- done
+ json_for_each_item proto_dhcp_add_sendopts sendopts dhcpopts
[ -z "$hostname" ] && hostname="$(cat /proc/sys/kernel/hostname)"
[ "$defaultreqopts" = 0 ] && defaultreqopts="-o" || defaultreqopts=
--
2.16.1
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] kernel: bump 4.4 to 4.4.117
This bumps the 4.4. kernel in master to 4.4.117.
More Meltdown & Spectre mitigation.
* Refresh patches.
* Refresh x86/config for RETPOLINE.
* Deleted 8049-PCI-layerscape-Add-fsl-ls2085a-pcie-compatible-ID.patch
(accepted upstream)
* Deleted 8050-PCI-layerscape-Fix-MSG-TLP-drop-setting.patch (accepted upstream)
* Deleted 650-pppoe_header_pad.patch (does not apply anymore (code was
replaced)).
Bumps from 4.4.113 to 4.4.115 were handled by Kevin Darbyshire-Bryant.
Compile-tested on: ar71xx & oxnas.
Signed-off-by: Stijn Segers
---
include/kernel-version.mk | 4 +-
.../004-register_gpio_driver_earlier.patch | 5 +-
.../patches-4.4/910-unaligned_access_hacks.patch | 12 ++--
...d-set-initial-ECC-params-based-on-info-fr.patch | 2 +-
5-03-mtd-nand-spi-nor-assign-MTD-of_node.patch | 2 +-
...4-mtd-nand-convert-to-nand_set_flash_node.patch | 4 +-
...nd-drop-unnecessary-partition-parser-data.patch | 8 +--
.../pending-4.4/001-mtdsplit_backport.patch| 2 +-
.../051-0005-ovl-proper-cleanup-of-workdir.patch | 2 +-
.../generic/pending-4.4/204-module_strip.patch | 12 ++--
.../generic/pending-4.4/221-module_exports.patch | 2 +-
...bi-auto-create-ubiblock-device-for-rootfs.patch | 4 +-
...-set-ROOT_DEV-to-ubiblock-rootfs-if-unset.patch | 4 +-
...610-netfilter_match_bypass_default_checks.patch | 14 ++---
.../generic/pending-4.4/650-pppoe_header_pad.patch | 20 --
...80-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +--
.../generic/pending-4.4/834-ledtrig-libata.patch | 8 +--
.../generic/pending-4.4/902-debloat_proc.patch | 2 +-
.../generic/pending-4.4/995-mangle_bootargs.patch | 2 +-
...mtd-backport-v4.7-0day-patches-from-Boris.patch | 72 +++---
...0074-mtd-nand-import-nand_hw_control_init.patch | 6 +-
.../linux/oxnas/patches-4.4/999-libata-hacks.patch | 4 +-
22 files changed, 92 insertions(+), 109 deletions(-)
delete mode 100644 target/linux/generic/pending-4.4/650-pppoe_header_pad.patch
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 293100ecf8..2b201daca3 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -3,12 +3,12 @@
LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .71
-LINUX_VERSION-4.4 = .112
+LINUX_VERSION-4.4 = .117
LINUX_VERSION-4.9 = .82
LINUX_VERSION-4.14 = .20
LINUX_KERNEL_HASH-3.18.71 =
5abc9778ad44ce02ed6c8ab52ece8a21c6d20d21f6ed8a19287b4a38a50c1240
-LINUX_KERNEL_HASH-4.4.112 =
544b42cbeed022896115c76a18fc97b4507d5b41d7ac0ce1dce9afd6ffd11ecd
+LINUX_KERNEL_HASH-4.4.117 =
120f490f9669784dd250a61f99003ad8906dcd746af2e4aad2ee73a4d42e4d68
LINUX_KERNEL_HASH-4.9.82 =
4b710b2701daafeb8e4db4c06f0ed3e62a6d20d6213a4927769c89ae42a9b180
LINUX_KERNEL_HASH-4.14.20 =
4ab7f42aa6af9c1e3b00cba6b1fa305a87407666aaa2fae555f7fbdaafb6d292
diff --git
a/target/linux/ar71xx/patches-4.4/004-register_gpio_driver_earlier.patch
b/target/linux/ar71xx/patches-4.4/004-register_gpio_driver_earlier.patch
index 0c07cb18c7..639e82c245 100644
--- a/target/linux/ar71xx/patches-4.4/004-register_gpio_driver_earlier.patch
+++ b/target/linux/ar71xx/patches-4.4/004-register_gpio_driver_earlier.patch
@@ -3,7 +3,7 @@ from mach files succeed.
--- a/drivers/gpio/gpio-ath79.c
+++ b/drivers/gpio/gpio-ath79.c
-@@ -202,4 +202,8 @@ static struct platform_driver ath79_gpio
+@@ -202,7 +202,11 @@ static struct platform_driver ath79_gpio
.probe = ath79_gpio_probe,
};
@@ -13,3 +13,6 @@ from mach files succeed.
+ return platform_driver_register(&ath79_gpio_driver);
+}
+postcore_initcall(ath79_gpio_init);
+
+ MODULE_DESCRIPTION("Atheros AR71XX/AR724X/AR913X GPIO API support");
+ MODULE_LICENSE("GPL v2");
diff --git a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
index a8d8c15c3b..9a440b4505 100644
--- a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
+++ b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
@@ -491,7 +491,7 @@
memcpy(p, foc->val, foc->len);
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
-@@ -529,7 +529,7 @@ static struct sk_buff *add_grec(struct s
+@@ -533,7 +533,7 @@ static struct sk_buff *add_grec(struct s
if (!skb)
return NULL;
psrc = (__be32 *)skb_put(skb, sizeof(__be32));
@@ -664,7 +664,7 @@
#define IP6_MF 0x0001
#define IP6_OFFSET 0xFFF8
-@@ -417,8 +417,8 @@ static inline void __ipv6_addr_set_half(
+@@ -418,8 +418,8 @@ static inline void __ipv6_addr_set_half(
}
#endif
#endif
@@ -675,7 +675,7 @@
}
static inline void ipv6_addr_set(struct in6_addr *addr,
-@@ -477,6 +477,8 @@ static inline bool ipv6_prefix_equal(con
+@@ -478,6 +478,8 @@ static inline bool ipv6_prefix_equal(con
const __be32 *a1 = addr1->s6_addr32;
const __be32 *a2 = addr2->s6_addr32;
unsigned int pdw, pbi;
@@ -684,7 +68
[LEDE-DEV] [PATCH] kernel: update 17.01 kernel to 4.4.117
Compile-tested on: ar71xx, ramips/mt7621, x86/64 Run-tested on: ar71xx, x86/64 Signed-off-by: Stijn Segers --- include/kernel-version.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 7fe6e7910b..fa4ca1eaf8 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -3,10 +3,10 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.18 = .43 -LINUX_VERSION-4.4 = .116 +LINUX_VERSION-4.4 = .117 LINUX_KERNEL_HASH-3.18.43 = 1236e8123a6ce537d5029232560966feed054ae31776fe8481dd7d18cdd5492c -LINUX_KERNEL_HASH-4.4.116 = 566fea5814627ee65cc1e6b9c4bfe2f7642ac36b6185e2a3dcb9e8ba1e325fa3 +LINUX_KERNEL_HASH-4.4.117 = 120f490f9669784dd250a61f99003ad8906dcd746af2e4aad2ee73a4d42e4d68 ifdef KERNEL_PATCHVER LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) -- 2.11.0 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] kernel: generic: Fix skip GRO for foreign MAC address patches
Somewhere in the kernel 4.9 migration process it looks like this patch
was broken. The update should be done when a device is added to the
bridge and when it gets removed, currently it is only done on the remove
path twice which does not make any sense.
I do not have a setup to test this now so this is only compile tested.
Fixes: f791fb4af450 ("kernel: add linux 4.9 support")
Fixes: b3f95490b9be ("kernel: generic: Add kernel 4.14 support")
Reported-by: Andrey Jr. Melnikov
Signed-off-by: Hauke Mehrtens
---
.../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 11 +--
.../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 11 +--
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git
a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index 5bcf99a648..d565a1b8bd 100644
---
a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++
b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -91,12 +91,19 @@ Signed-off-by: Felix Fietkau
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info)
-@@ -6353,6 +6398,8 @@ void netdev_upper_dev_unlink(struct net_
+@@ -6276,6 +6321,7 @@ static int __netdev_upper_dev_link(struc
+ if (ret)
+ return ret;
+
++ netdev_update_addr_mask(dev);
+ ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
+ &changeupper_info.info);
+ ret = notifier_to_errno(ret);
+@@ -6353,6 +6399,7 @@ void netdev_upper_dev_unlink(struct net_
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
+ netdev_update_addr_mask(dev);
-+ netdev_update_addr_mask(dev);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
}
diff --git
a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
index ce13e719e3..5d432b1f3e 100644
---
a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
+++
b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
@@ -93,12 +93,19 @@ Signed-off-by: Felix Fietkau
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info)
-@@ -6021,6 +6066,8 @@ void netdev_upper_dev_unlink(struct net_
+@@ -5895,6 +5940,7 @@ static int __netdev_upper_dev_link(struc
+ goto rollback_lower_mesh;
+ }
+
++ netdev_update_addr_mask(dev);
+ ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
+ &changeupper_info.info);
+ ret = notifier_to_errno(ret);
+@@ -6021,6 +6067,7 @@ void netdev_upper_dev_unlink(struct net_
list_for_each_entry(i, &upper_dev->all_adj_list.upper, list)
__netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr);
+ netdev_update_addr_mask(dev);
-+ netdev_update_addr_mask(dev);
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev,
&changeupper_info.info);
}
--
2.11.0
___
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] mvebu to kernel 4.14
On 02/17/2018 03:25 PM, Hauke Mehrtens wrote: > Hi, > > I would like to use kernel 4.14 by default on the mvebu target soon. > If you are aware of any regressions compared to kernel 4.9 then please > report them, now. > > I only have a Linksys device here for testing and I haven't tested the > SFP functionality, would be nice if someone could test if that still > works with kernel 4.14. I got two positive reports from users of Linksys devices. Jonas reported that the SFP slot on the clearfog board does not work at all, he wants to investigate this problem. The broken SFP support is the only known regression for the mvebu target with kernel 4.14. Hauke ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
