diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index e9e95fa9b3..2986aff431 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2021-04-11 -PKG_SOURCE_VERSION:=bf45b30d891961dd7c4139dddb58b909ea2c2b5a -PKG_MIRROR_HASH:=431cecf80dafa986e805f809522721c2bb26289867d6770695d49baf8b471bea +PKG_SOURCE_DATE:=2021-05-10 +PKG_SOURCE_VERSION:=ff8bbe22dd87d86b69be7d5619d88fd187ce3017 +PKG_MIRROR_HASH:=aaaac3f9ec2c7836254f594696179369dd7e42c2ded8fb4ad62fbf5359f8c875 PKG_MAINTAINER:=Felix Fietkau PKG_BUILD_PARALLEL:=1 diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index 0896a7dada..56653b3ec8 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -12,10 +12,10 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git -PKG_SOURCE_DATE:=2021-03-11 -PKG_SOURCE_VERSION:=ccb75178cf6a726896729c6904bd623636aa0b29 +PKG_SOURCE_DATE:=2021-05-05 +PKG_SOURCE_VERSION:=7a560a1a5769146ab072f8e0165940459d3e16f7 PKG_MAINTAINER:=Jo-Philipp Wich -PKG_MIRROR_HASH:=87b1839275c209f9767057d6da5272cae973a064767fa28f380a37fb65e2e643 +PKG_MIRROR_HASH:=4a938aa4c0b53c94baea04475a0f60dc6fba797c0fbb23ec76ca2ff96faaa1ec PKG_LICENSE:=ISC PKG_LICENSE_FILES:= diff --git a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index d060568593..463083628f 100644 --- a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -1677,12 +1677,12 @@ static int ag71xx_probe(struct platform_device *pdev) } #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0) - of_get_phy_mode(np, &ag->phy_if_mode); + err = of_get_phy_mode(np, &ag->phy_if_mode); + if (err < 0) { #else ag->phy_if_mode = of_get_phy_mode(np); -#endif - if (ag->phy_if_mode < 0) { +#endif dev_err(&pdev->dev, "missing phy-mode property in DT\n"); return ag->phy_if_mode; } diff --git a/target/linux/ramips/dts/mt7620a_youku_yk1.dts b/target/linux/ramips/dts/mt7620a_youku_yk1.dts index 71fd1d12c0..2e59e5bf6e 100644 --- a/target/linux/ramips/dts/mt7620a_youku_yk1.dts +++ b/target/linux/ramips/dts/mt7620a_youku_yk1.dts @@ -12,6 +12,7 @@ led-failsafe = &led_power; led-running = &led_power; led-upgrade = &led_power; + label-mac-device = ðernet; }; leds { @@ -106,7 +107,7 @@ ðernet { pinctrl-names = "default"; - mtd-mac-address = <&factory 0x4>; + mtd-mac-address = <&factory 0x28>; mediatek,portmap = "llllw"; }; diff --git a/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts b/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts index f6a42286f1..ef3306caa7 100644 --- a/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts +++ b/target/linux/ramips/dts/mt7621_zyxel_nr7101.dts @@ -10,27 +10,27 @@ model = "ZyXEL NR7101"; aliases { - led-boot = &power; - led-failsafe = &power; - led-running = &power; - led-upgrade = &power; + led-boot = &led_system_green; + led-failsafe = &led_system_green; + led-running = &led_system_green; + led-upgrade = &led_system_green; label-mac-device = &gmac0; }; leds { compatible = "gpio-leds"; - led@13 { + system_yellow { label = "yellow:system"; gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; }; - power: led@14 { + led_system_green: system_green { label = "green:system"; gpios = <&gpio 14 GPIO_ACTIVE_HIGH>; }; - led@15 { + system_red { label = "red:system"; gpios = <&gpio 15 GPIO_ACTIVE_HIGH>; }; diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network index d85bdd822b..17fa48c739 100644 --- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network @@ -254,7 +254,6 @@ ramips_setup_macs() sanlinking,d240|\ vonets,var11n-300|\ wrtnode,wrtnode|\ - youku,yk1|\ zbtlink,zbt-ape522ii|\ zbtlink,zbt-wa05|\ zbtlink,zbt-we2026|\ @@ -338,7 +337,8 @@ ramips_setup_macs() lenovo,newifi-y1|\ lenovo,newifi-y1s|\ ohyeah,oy-0001|\ - wavlink,wl-wn530hg4) + wavlink,wl-wn530hg4|\ + youku,yk1) wan_mac=$(mtd_get_mac_binary factory 0x2e) ;; linksys,e1700) diff --git a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/rtl838x.c b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/rtl838x.c index dfd773c5e6..5d764b6a32 100644 --- a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/rtl838x.c +++ b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/rtl838x.c @@ -398,7 +398,7 @@ static void rtl838x_vlan_profile_setup(int profile) * On RTL93XX, the portmask is directly set in the profile, * see e.g. rtl9300_vlan_profile_setup */ - rtl838x_write_mcast_pmask(UNKNOWN_MC_PMASK, 0xfffffff); + rtl838x_write_mcast_pmask(UNKNOWN_MC_PMASK, 0x1fffffff); } static inline int rtl838x_vlan_port_egr_filter(int port) diff --git a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/rtl839x.c b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/rtl839x.c index 74472461a1..c62dc441c1 100644 --- a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/rtl839x.c +++ b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/rtl839x.c @@ -411,7 +411,7 @@ static void rtl839x_vlan_profile_setup(int profile) sw_w32(p[0], RTL839X_VLAN_PROFILE(profile)); sw_w32(p[1], RTL839X_VLAN_PROFILE(profile) + 4); - rtl839x_write_mcast_pmask(UNKNOWN_MC_PMASK, 0x000fffffffffffff); + rtl839x_write_mcast_pmask(UNKNOWN_MC_PMASK, 0x001fffffffffffff); } static inline int rtl839x_vlan_port_egr_filter(int port) diff --git a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/rtl930x.c b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/rtl930x.c index 820c78165a..f1de39f0bc 100644 --- a/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/rtl930x.c +++ b/target/linux/realtek/files-5.4/drivers/net/dsa/rtl83xx/rtl930x.c @@ -153,9 +153,9 @@ static void rtl930x_vlan_profile_setup(int profile) // Enable routing of Ipv4/6 Unicast and IPv4/6 Multicast traffic p[0] |= BIT(17) | BIT(16) | BIT(13) | BIT(12); - p[2] = 0x0fffffff; // L2 unknwon MC flooding portmask: all but the CPU-port - p[3] = 0x0fffffff; // IPv4 unknwon MC flooding portmask - p[4] = 0x0fffffff; // IPv6 unknwon MC flooding portmask + p[2] = 0x1fffffff; // L2 unknown MC flooding portmask all ports, including the CPU-port + p[3] = 0x1fffffff; // IPv4 unknown MC flooding portmask + p[4] = 0x1fffffff; // IPv6 unknown MC flooding portmask sw_w32(p[0], RTL930X_VLAN_PROFILE_SET(profile)); sw_w32(p[1], RTL930X_VLAN_PROFILE_SET(profile) + 4);