OSDN > Trouver un logiciel > ImmortalWrt > SCM > git > immortalwrt > Commit

ImmortalWrt
Fork
immortalwrt
packages
luci

R/O
HTTP
SSH
HTTPS

immortalwrt: Commit

Mirror only - Please move to https://github.com/immortalwrt/immortalwrt

Commit MetaInfo

Révision	6cf222540e4ba4eb7c4df53418fccc6057a9177e (tree)
l'heure	2022-01-21 12:37:11
Auteur	Tianling Shen <i@cnsz...>
Commiter	Tianling Shen

Message de Log

Merge Official Source

Signed-off-by: Tianling Shen <i@cnsztl.eu.org>

Change Summary

modified: include/kernel-version.mk (diff)
modified: package/libs/ustream-ssl/Makefile (diff)
modified: package/system/procd/Makefile (diff)
modified: target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch (diff)
modified: target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch (diff)
modified: target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts (diff)
modified: target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch (diff)
modified: target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch (diff)
modified: target/linux/bcm27xx/patches-5.4/950-0111-lan78xx-Read-initial-EEE-status-from-DT.patch (diff)
modified: target/linux/bcm27xx/patches-5.4/950-0117-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch (diff)
modified: target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch (diff)
modified: target/linux/bcm27xx/patches-5.4/950-0119-Add-rpi-poe-fan-driver.patch (diff)
modified: target/linux/bcm27xx/patches-5.4/950-0132-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch (diff)
modified: target/linux/bcm27xx/patches-5.4/950-0137-lan78xx-EEE-support-is-now-a-PHY-property.patch (diff)
modified: target/linux/bcm27xx/patches-5.4/950-0145-lan78xx-use-default-alignment-for-rx-buffers.patch (diff)
modified: target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch (diff)
modified: target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch (diff)
modified: target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch (diff)
modified: target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch (diff)
modified: target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch (diff)
modified: target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi (diff)
modified: tools/firmware-utils/src/tplink-safeloader.c (diff)

Modification

--- a/include/kernel-version.mk

+++ b/include/kernel-version.mk

		@@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
6	6	KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
7	7	endif
8	8
9		-LINUX_VERSION-5.4 = .168
	9	+LINUX_VERSION-5.4 = .171
10	10
11		-LINUX_KERNEL_HASH-5.4.168 = ecb79ac4d465623560a6da31e3b0a0cf3fbb7c09e9ba88f06567436757191181
	11	+LINUX_KERNEL_HASH-5.4.171 = afbcc8ed7d85485af299567f307b03057ffff3ec7bee02a21c33933d435b4958
12	12
13	13	remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
14	14	sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

--- a/package/libs/ustream-ssl/Makefile

+++ b/package/libs/ustream-ssl/Makefile

		@@ -1,7 +1,7 @@
1	1	include $(TOPDIR)/rules.mk
2	2
3	3	PKG_NAME:=ustream-ssl
4		-PKG_RELEASE:=1
	4	+PKG_RELEASE:=2
5	5
6	6	PKG_SOURCE_PROTO:=git
7	7	PKG_SOURCE_URL=$(PROJECT_GIT)/project/ustream-ssl.git

		@@ -37,6 +37,7 @@ define Package/libustream-wolfssl
37	37	$(Package/libustream/default)
38	38	TITLE += (wolfssl)
39	39	DEPENDS += +PACKAGE_libustream-wolfssl:libwolfssl
	40	+ CONFLICTS := libustream-openssl
40	41	VARIANT:=wolfssl
41	42	endef
42	43

		@@ -44,6 +45,7 @@ define Package/libustream-mbedtls
44	45	$(Package/libustream/default)
45	46	TITLE += (mbedtls)
46	47	DEPENDS += +libmbedtls
	48	+ CONFLICTS := libustream-openssl libustream-wolfssl
47	49	VARIANT:=mbedtls
48	50	DEFAULT_VARIANT:=1
49	51	endef

--- a/package/system/procd/Makefile

+++ b/package/system/procd/Makefile

		@@ -12,9 +12,9 @@ PKG_RELEASE:=$(AUTORELEASE)
12	12
13	13	PKG_SOURCE_PROTO:=git
14	14	PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
15		-PKG_SOURCE_DATE:=2021-02-23
16		-PKG_SOURCE_VERSION:=37eed131e9967a35f47bacb3437a9d3c8a57b3f4
17		-PKG_MIRROR_HASH:=2b0131ff9055ccf987cbeb5f36c2c2585dc780999df6be312fbbbcd61ce676d4
	15	+PKG_SOURCE_DATE:=2021-03-08
	16	+PKG_SOURCE_VERSION:=2cfc26f8456a4d5ba3836c914a742f3d00bad781
	17	+PKG_MIRROR_HASH:=4b514143949b6ea5799a7b0b2f2f4ad5f084f88929eb0ac5a01ffc7852a71d22
18	18	CMAKE_INSTALL:=1
19	19
20	20	PKG_LICENSE:=GPL-2.0

--- a/target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch

+++ b/target/linux/apm821xx/patches-5.4/801-usb-xhci-add-firmware-loader-for-uPD720201-and-uPD72.patch

		@@ -93,7 +93,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
93	93	static const char hcd_name[] = "xhci_hcd";
94	94
95	95	static struct hc_driver __read_mostly xhci_pci_hc_driver;
96		-@@ -331,6 +371,873 @@ static void xhci_pme_acpi_rtd3_enable(st
	96	+@@ -334,6 +374,873 @@ static void xhci_pme_acpi_rtd3_enable(st
97	97	static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
98	98	#endif /* CONFIG_ACPI */
99	99

		@@ -967,7 +967,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
967	967	/* called during probe() after chip reset completes */
968	968	static int xhci_pci_setup(struct usb_hcd *hcd)
969	969	{
970		-@@ -372,6 +1279,27 @@ static int xhci_pci_probe(struct pci_dev
	970	+@@ -375,6 +1282,27 @@ static int xhci_pci_probe(struct pci_dev
971	971	struct hc_driver *driver;
972	972	struct usb_hcd *hcd;
973	973

		@@ -995,7 +995,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
995	995	driver = (struct hc_driver *)id->driver_data;
996	996
997	997	/* Prevent runtime suspending between USB-2 and USB-3 initialization */
998		-@@ -433,6 +1361,16 @@ static void xhci_pci_remove(struct pci_d
	998	+@@ -436,6 +1364,16 @@ static void xhci_pci_remove(struct pci_d
999	999	{
1000	1000	struct xhci_hcd *xhci;
1001	1001

		@@ -1012,7 +1012,7 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
1012	1012	xhci = hcd_to_xhci(pci_get_drvdata(dev));
1013	1013	xhci->xhc_state \|= XHCI_STATE_REMOVING;
1014	1014
1015		-@@ -572,6 +1510,11 @@ static int xhci_pci_resume(struct usb_hc
	1015	+@@ -575,6 +1513,11 @@ static int xhci_pci_resume(struct usb_hc
1016	1016	if (pdev->vendor == PCI_VENDOR_ID_INTEL)
1017	1017	usb_enable_intel_xhci_ports(pdev);
1018	1018

--- a/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch

+++ b/target/linux/apm821xx/patches-5.4/802-usb-xhci-force-msi-renesas-xhci.patch

		@@ -13,7 +13,7 @@ produce a noisy warning.
13	13
14	14	--- a/drivers/usb/host/xhci-pci.c
15	15	+++ b/drivers/usb/host/xhci-pci.c
16		-@@ -299,6 +299,7 @@ static void xhci_pci_quirks(struct devic
	16	+@@ -302,6 +302,7 @@ static void xhci_pci_quirks(struct devic
17	17	pdev->device == 0x0015) {
18	18	xhci->quirks \|= XHCI_RESET_ON_RESUME;
19	19	xhci->quirks \|= XHCI_ZERO_64B_REGS;

--- a/target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts

+++ b/target/linux/ath79/dts/ar9342_mikrotik_routerboard-912uag-2hpnd.dts

		@@ -127,6 +127,10 @@
127	127	};
128	128	};
129	129
	130	+&ref {
	131	+ clock-frequency = <25000000>;
	132	+};
	133	+
130	134	&spi {
131	135	status = "okay";
132	136

--- a/target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-0030-lan78xx-Enable-LEDs-and-auto-negotiation.patch

		@@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
14	14
15	15	--- a/drivers/net/usb/lan78xx.c
16	16	+++ b/drivers/net/usb/lan78xx.c
17		-@@ -2469,6 +2469,11 @@ static int lan78xx_reset(struct lan78xx_
	17	+@@ -2471,6 +2471,11 @@ static int lan78xx_reset(struct lan78xx_
18	18	int ret = 0;
19	19	unsigned long timeout;
20	20	u8 sig;

		@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
26	26
27	27	ret = lan78xx_read_reg(dev, HW_CFG, &buf);
28	28	buf \|= HW_CFG_LRST_;
29		-@@ -2522,6 +2527,9 @@ static int lan78xx_reset(struct lan78xx_
	29	+@@ -2524,6 +2529,9 @@ static int lan78xx_reset(struct lan78xx_
30	30
31	31	ret = lan78xx_read_reg(dev, HW_CFG, &buf);
32	32	buf \|= HW_CFG_MEF_;

		@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
36	36	ret = lan78xx_write_reg(dev, HW_CFG, buf);
37	37
38	38	ret = lan78xx_read_reg(dev, USB_CFG0, &buf);
39		-@@ -2577,6 +2585,9 @@ static int lan78xx_reset(struct lan78xx_
	39	+@@ -2579,6 +2587,9 @@ static int lan78xx_reset(struct lan78xx_
40	40	buf \|= MAC_CR_AUTO_DUPLEX_ \| MAC_CR_AUTO_SPEED_;
41	41	}
42	42	}

--- a/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch

		@@ -279,7 +279,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
279	279	}
280	280	--- a/drivers/mmc/core/host.c
281	281	+++ b/drivers/mmc/core/host.c
282		-@@ -434,15 +434,30 @@ struct mmc_host *mmc_alloc_host(int extr
	282	+@@ -443,15 +443,30 @@ struct mmc_host *mmc_alloc_host(int extr
283	283	{
284	284	int err;
285	285	struct mmc_host *host;

--- a/target/linux/bcm27xx/patches-5.4/950-0111-lan78xx-Read-initial-EEE-status-from-DT.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-0111-lan78xx-Read-initial-EEE-status-from-DT.patch

		@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
15	15
16	16	--- a/drivers/net/usb/lan78xx.c
17	17	+++ b/drivers/net/usb/lan78xx.c
18		-@@ -2651,6 +2651,22 @@ static int lan78xx_open(struct net_devic
	18	+@@ -2653,6 +2653,22 @@ static int lan78xx_open(struct net_devic
19	19
20	20	netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
21	21

--- a/target/linux/bcm27xx/patches-5.4/950-0117-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-0117-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch

		@@ -21,7 +21,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
21	21
22	22	--- a/drivers/net/usb/lan78xx.c
23	23	+++ b/drivers/net/usb/lan78xx.c
24		-@@ -425,6 +425,15 @@ static int msg_level = -1;
	24	+@@ -427,6 +427,15 @@ static int msg_level = -1;
25	25	module_param(msg_level, int, 0);
26	26	MODULE_PARM_DESC(msg_level, "Override default message level");
27	27

		@@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
37	37	static int lan78xx_read_reg(struct lan78xx_net dev, u32 index, u32 data)
38	38	{
39	39	u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL);
40		-@@ -2933,8 +2942,14 @@ static int lan78xx_bind(struct lan78xx_n
	40	+@@ -2935,8 +2944,14 @@ static int lan78xx_bind(struct lan78xx_n
41	41	if (DEFAULT_RX_CSUM_ENABLE)
42	42	dev->net->features \|= NETIF_F_RXCSUM;
43	43

--- a/target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-0118-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch

		@@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
16	16
17	17	--- a/drivers/net/usb/lan78xx.c
18	18	+++ b/drivers/net/usb/lan78xx.c
19		-@@ -2183,6 +2183,22 @@ static int lan78xx_phy_init(struct lan78
	19	+@@ -2185,6 +2185,22 @@ static int lan78xx_phy_init(struct lan78
20	20	mii_adv_to_linkmode_adv_t(fc, mii_adv);
21	21	linkmode_or(phydev->advertising, fc, phydev->advertising);
22	22

		@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
39	39	if (phydev->mdio.dev.of_node) {
40	40	u32 reg;
41	41	int len;
42		-@@ -2660,22 +2676,6 @@ static int lan78xx_open(struct net_devic
	42	+@@ -2662,22 +2678,6 @@ static int lan78xx_open(struct net_devic
43	43
44	44	netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
45	45

--- a/target/linux/bcm27xx/patches-5.4/950-0119-Add-rpi-poe-fan-driver.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-0119-Add-rpi-poe-fan-driver.patch

		@@ -108,7 +108,7 @@ Signed-off-by: Serge Schneider <serge@raspberrypi.org>
108	108	+the fan to the user space through the hwmon sysfs interface.
109	109	--- a/drivers/hwmon/Kconfig
110	110	+++ b/drivers/hwmon/Kconfig
111		-@@ -1356,6 +1356,17 @@ config SENSORS_RASPBERRYPI_HWMON
	111	+@@ -1357,6 +1357,17 @@ config SENSORS_RASPBERRYPI_HWMON
112	112	This driver can also be built as a module. If so, the module
113	113	will be called raspberrypi-hwmon.
114	114

--- a/target/linux/bcm27xx/patches-5.4/950-0132-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-0132-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch

		@@ -15,7 +15,7 @@ See: https://github.com/raspberrypi/linux/issues/2447
15	15	1 file changed, 11 insertions(+), 1 deletion(-)
16	16	--- a/drivers/net/usb/lan78xx.c
17	17	+++ b/drivers/net/usb/lan78xx.c
18		-@@ -434,6 +434,11 @@ static bool enable_tso;
	18	+@@ -436,6 +436,11 @@ static bool enable_tso;
19	19	module_param(enable_tso, bool, 0644);
20	20	MODULE_PARM_DESC(enable_tso, "Enables TCP segmentation offload");
21	21

		@@ -27,7 +27,7 @@ See: https://github.com/raspberrypi/linux/issues/2447
27	27	static int lan78xx_read_reg(struct lan78xx_net dev, u32 index, u32 data)
28	28	{
29	29	u32 *buf = kmalloc(sizeof(u32), GFP_KERNEL);
30		-@@ -3776,7 +3781,12 @@ static int lan78xx_probe(struct usb_inte
	30	+@@ -3778,7 +3783,12 @@ static int lan78xx_probe(struct usb_inte
31	31	netdev->max_mtu = MAX_SINGLE_PACKET_SIZE;
32	32	netif_set_gso_max_size(netdev, MAX_SINGLE_PACKET_SIZE - MAX_HEADER);
33	33

--- a/target/linux/bcm27xx/patches-5.4/950-0137-lan78xx-EEE-support-is-now-a-PHY-property.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-0137-lan78xx-EEE-support-is-now-a-PHY-property.patch

		@@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
15	15
16	16	--- a/drivers/net/usb/lan78xx.c
17	17	+++ b/drivers/net/usb/lan78xx.c
18		-@@ -2188,7 +2188,7 @@ static int lan78xx_phy_init(struct lan78
	18	+@@ -2190,7 +2190,7 @@ static int lan78xx_phy_init(struct lan78
19	19	mii_adv_to_linkmode_adv_t(fc, mii_adv);
20	20	linkmode_or(phydev->advertising, fc, phydev->advertising);
21	21

--- a/target/linux/bcm27xx/patches-5.4/950-0145-lan78xx-use-default-alignment-for-rx-buffers.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-0145-lan78xx-use-default-alignment-for-rx-buffers.patch

		@@ -12,7 +12,7 @@ in both dwc_otg and in ipv6 processing.
12	12
13	13	--- a/drivers/net/usb/lan78xx.c
14	14	+++ b/drivers/net/usb/lan78xx.c
15		-@@ -3177,7 +3177,7 @@ static int rx_submit(struct lan78xx_net
	15	+@@ -3179,7 +3179,7 @@ static int rx_submit(struct lan78xx_net
16	16	size_t size = dev->rx_urb_size;
17	17	int ret = 0;
18	18

--- a/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-0211-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch

		@@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
10	10
11	11	--- a/drivers/usb/host/xhci-pci.c
12	12	+++ b/drivers/usb/host/xhci-pci.c
13		-@@ -268,6 +268,10 @@ static void xhci_pci_quirks(struct devic
	13	+@@ -271,6 +271,10 @@ static void xhci_pci_quirks(struct devic
14	14	pdev->device == 0x3432)
15	15	xhci->quirks \|= XHCI_BROKEN_STREAMS;
16	16

--- a/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-0264-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch

		@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
23	23
24	24	--- a/drivers/usb/host/xhci-pci.c
25	25	+++ b/drivers/usb/host/xhci-pci.c
26		-@@ -269,8 +269,10 @@ static void xhci_pci_quirks(struct devic
	26	+@@ -272,8 +272,10 @@ static void xhci_pci_quirks(struct devic
27	27	xhci->quirks \|= XHCI_BROKEN_STREAMS;
28	28
29	29	if (pdev->vendor == PCI_VENDOR_ID_VIA &&

--- a/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-0993-xhci-quirks-add-link-TRB-quirk-for-VL805.patch

		@@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
22	22
23	23	--- a/drivers/usb/host/xhci-pci.c
24	24	+++ b/drivers/usb/host/xhci-pci.c
25		-@@ -272,6 +272,7 @@ static void xhci_pci_quirks(struct devic
	25	+@@ -275,6 +275,7 @@ static void xhci_pci_quirks(struct devic
26	26	pdev->device == 0x3483) {
27	27	xhci->quirks \|= XHCI_LPM_SUPPORT;
28	28	xhci->quirks \|= XHCI_EP_CTX_BROKEN_DCS;

--- a/target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch

+++ b/target/linux/bcm27xx/patches-5.4/950-1031-net-lan78xx-Ack-pending-PHY-ints-when-resetting.patch

		@@ -20,7 +20,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
20	20
21	21	--- a/drivers/net/usb/lan78xx.c
22	22	+++ b/drivers/net/usb/lan78xx.c
23		-@@ -1181,6 +1181,9 @@ static int lan78xx_link_reset(struct lan
	23	+@@ -1183,6 +1183,9 @@ static int lan78xx_link_reset(struct lan
24	24	if (unlikely(ret < 0))
25	25	return -EIO;
26	26

--- a/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

+++ b/target/linux/generic/pending-5.4/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch

		@@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
185	185	cfg->fc_flags \|= RTF_REJECT;
186	186
187	187	if (rtm->rtm_type == RTN_LOCAL)
188		-@@ -6056,6 +6087,8 @@ static int ip6_route_dev_notify(struct n
	188	+@@ -6084,6 +6115,8 @@ static int ip6_route_dev_notify(struct n
189	189	#ifdef CONFIG_IPV6_MULTIPLE_TABLES
190	190	net->ipv6.ip6_prohibit_entry->dst.dev = dev;
191	191	net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);

		@@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
194	194	net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
195	195	net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
196	196	#endif
197		-@@ -6067,6 +6100,7 @@ static int ip6_route_dev_notify(struct n
	197	+@@ -6095,6 +6128,7 @@ static int ip6_route_dev_notify(struct n
198	198	in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
199	199	#ifdef CONFIG_IPV6_MULTIPLE_TABLES
200	200	in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);

		@@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
202	202	in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
203	203	#endif
204	204	}
205		-@@ -6259,6 +6293,8 @@ static int __net_init ip6_route_net_init
	205	+@@ -6287,6 +6321,8 @@ static int __net_init ip6_route_net_init
206	206
207	207	#ifdef CONFIG_IPV6_MULTIPLE_TABLES
208	208	net->ipv6.fib6_has_custom_rules = false;

		@@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
211	211	net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,
212	212	sizeof(*net->ipv6.ip6_prohibit_entry),
213	213	GFP_KERNEL);
214		-@@ -6269,11 +6305,21 @@ static int __net_init ip6_route_net_init
	214	+@@ -6297,11 +6333,21 @@ static int __net_init ip6_route_net_init
215	215	ip6_template_metrics, true);
216	216	INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached);
217	217

		@@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
234	234	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
235	235	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
236	236	ip6_template_metrics, true);
237		-@@ -6297,6 +6343,8 @@ out:
	237	+@@ -6325,6 +6371,8 @@ out:
238	238	return ret;
239	239
240	240	#ifdef CONFIG_IPV6_MULTIPLE_TABLES

		@@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
243	243	out_ip6_prohibit_entry:
244	244	kfree(net->ipv6.ip6_prohibit_entry);
245	245	out_ip6_null_entry:
246		-@@ -6316,6 +6364,7 @@ static void __net_exit ip6_route_net_exi
	246	+@@ -6344,6 +6392,7 @@ static void __net_exit ip6_route_net_exi
247	247	kfree(net->ipv6.ip6_null_entry);
248	248	#ifdef CONFIG_IPV6_MULTIPLE_TABLES
249	249	kfree(net->ipv6.ip6_prohibit_entry);

		@@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
251	251	kfree(net->ipv6.ip6_blk_hole_entry);
252	252	#endif
253	253	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
254		-@@ -6393,6 +6442,9 @@ void __init ip6_route_init_special_entri
	254	+@@ -6421,6 +6470,9 @@ void __init ip6_route_init_special_entri
255	255	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
256	256	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
257	257	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);

--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi

+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9_avm_fritz736x.dtsi

		@@ -33,13 +33,13 @@
33	33
34	34	dect {
35	35	label = "dect";
36		- gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
	36	+ gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
37	37	linux,code = <KEY_PHONE>;
38	38	};
39	39
40	40	wifi {
41	41	label = "wifi";
42		- gpios = <&gpio 29 GPIO_ACTIVE_HIGH>;
	42	+ gpios = <&gpio 29 GPIO_ACTIVE_LOW>;
43	43	linux,code = <KEY_RFKILL>;
44	44	};
45	45	};

--- a/tools/firmware-utils/src/tplink-safeloader.c

+++ b/tools/firmware-utils/src/tplink-safeloader.c

		@@ -761,7 +761,7 @@ static struct device_info boards[] = {
761	761	"{product_name:Archer A7,product_ver:5.0.0,special_id:54570000}\n"
762	762	"{product_name:Archer A7,product_ver:5.0.0,special_id:52550000}\n",
763	763	.part_trail = 0x00,
764		- .soft_ver = "soft_ver:1.0.0\n",
	764	+ .soft_ver = "soft_ver:7.0.0\n",
765	765
766	766	/* We're using a dynamic kernel/rootfs split here */
767	767	.partitions = {

Afficher sur ancien navigateur de dépôt.