OSDN > Pesquisar Software > 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

Revisão	3d6248d855ab19f1050bf1c0004f6aa1d8601fcc (tree)
Hora	2022-01-25 20:40:05
Autor	Tianling Shen <cnsztl@immo...>
Commiter	Tianling Shen

Mensagem de Log

kernel: bump to 4.9.297, 4.14.262, 4.19.225

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

Mudança Sumário

Diff

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

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

		@@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL
6	6	KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
7	7	endif
8	8
9		-LINUX_VERSION-4.9 = .294
10		-LINUX_VERSION-4.14 = .259
11		-LINUX_VERSION-4.19 = .222
	9	+LINUX_VERSION-4.9 = .297
	10	+LINUX_VERSION-4.14 = .262
	11	+LINUX_VERSION-4.19 = .225
12	12
13		-LINUX_KERNEL_HASH-4.9.294 = 31ca50df2076040d84e721a6f01021ac2a125a0c5adb73c977fed91f323fa268
14		-LINUX_KERNEL_HASH-4.14.259 = 26e284541ff77bd3af14e40aa690bcf229d0f9b9677704fd9fecb59e108e4368
15		-LINUX_KERNEL_HASH-4.19.222 = 97b0830c3d7d90acfc850bcbfdeb64e6cb3e1cb58e079b8b7d0f5bb0a9618838
	13	+LINUX_KERNEL_HASH-4.9.297 = e43ba8cde809b3126a5192f5a8a83f47134a138955ce6811672f5f704db6d89f
	14	+LINUX_KERNEL_HASH-4.14.262 = 4cfd785381edbfcd86dfb1cd8d264d872643d71afd2b832fa2090f5b7228d417
	15	+LINUX_KERNEL_HASH-4.19.225 = 4b9ab3979541cd436b7b7e8905c77ffcf594a9cf4ea3fb9474ef95fe09586796
16	16
17	17	remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
18	18	sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

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

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

		@@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
44	44
45	45	#include "xhci.h"
46	46	#include "xhci-trace.h"
47		-@@ -282,6 +284,458 @@ static void xhci_pme_acpi_rtd3_enable(st
	47	+@@ -285,6 +287,458 @@ static void xhci_pme_acpi_rtd3_enable(st
48	48	static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
49	49	#endif /* CONFIG_ACPI */
50	50

		@@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
503	503	/* called during probe() after chip reset completes */
504	504	static int xhci_pci_setup(struct usb_hcd *hcd)
505	505	{
506		-@@ -320,6 +774,22 @@ static int xhci_pci_probe(struct pci_dev
	506	+@@ -323,6 +777,22 @@ static int xhci_pci_probe(struct pci_dev
507	507	struct hc_driver *driver;
508	508	struct usb_hcd *hcd;
509	509

		@@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
526	526	driver = (struct hc_driver *)id->driver_data;
527	527
528	528	/* For some HW implementation, a XHCI reset is just not enough... */
529		-@@ -381,6 +851,16 @@ static void xhci_pci_remove(struct pci_d
	529	+@@ -384,6 +854,16 @@ static void xhci_pci_remove(struct pci_d
530	530	{
531	531	struct xhci_hcd *xhci;
532	532

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

+++ b/target/linux/apm821xx/patches-4.14/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		-@@ -228,7 +228,7 @@ static void xhci_pci_quirks(struct devic
	16	+@@ -231,7 +231,7 @@ static void xhci_pci_quirks(struct devic
17	17	xhci->quirks \|= XHCI_TRUST_TX_LENGTH;
18	18	if (pdev->vendor == PCI_VENDOR_ID_RENESAS &&
19	19	pdev->device == 0x0015)

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

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

		@@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
44	44
45	45	#include "xhci.h"
46	46	#include "xhci-trace.h"
47		-@@ -285,6 +287,458 @@ static void xhci_pme_acpi_rtd3_enable(st
	47	+@@ -288,6 +290,458 @@ static void xhci_pme_acpi_rtd3_enable(st
48	48	static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
49	49	#endif /* CONFIG_ACPI */
50	50

		@@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
503	503	/* called during probe() after chip reset completes */
504	504	static int xhci_pci_setup(struct usb_hcd *hcd)
505	505	{
506		-@@ -326,6 +780,22 @@ static int xhci_pci_probe(struct pci_dev
	506	+@@ -329,6 +783,22 @@ static int xhci_pci_probe(struct pci_dev
507	507	struct hc_driver *driver;
508	508	struct usb_hcd *hcd;
509	509

		@@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
526	526	driver = (struct hc_driver *)id->driver_data;
527	527
528	528	/* Prevent runtime suspending between USB-2 and USB-3 initialization */
529		-@@ -384,6 +854,16 @@ static void xhci_pci_remove(struct pci_d
	529	+@@ -387,6 +857,16 @@ static void xhci_pci_remove(struct pci_d
530	530	{
531	531	struct xhci_hcd *xhci;
532	532

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

+++ b/target/linux/apm821xx/patches-4.19/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		-@@ -231,6 +231,7 @@ static void xhci_pci_quirks(struct devic
	16	+@@ -234,6 +234,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/bcm27xx/patches-4.19/950-0032-lan78xx-Enable-LEDs-and-auto-negotiation.patch

+++ b/target/linux/bcm27xx/patches-4.19/950-0032-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		-@@ -2479,6 +2479,11 @@ static int lan78xx_reset(struct lan78xx_
	17	+@@ -2481,6 +2481,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		-@@ -2532,6 +2537,9 @@ static int lan78xx_reset(struct lan78xx_
	29	+@@ -2534,6 +2539,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		-@@ -2587,6 +2595,9 @@ static int lan78xx_reset(struct lan78xx_
	39	+@@ -2589,6 +2597,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-4.19/950-0120-lan78xx-Read-initial-EEE-status-from-DT.patch

+++ b/target/linux/bcm27xx/patches-4.19/950-0120-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		-@@ -2661,6 +2661,22 @@ static int lan78xx_open(struct net_devic
	18	+@@ -2663,6 +2663,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-4.19/950-0127-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch

+++ b/target/linux/bcm27xx/patches-4.19/950-0127-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		-@@ -436,6 +436,15 @@ static int msg_level = -1;
	24	+@@ -438,6 +438,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		-@@ -2946,8 +2955,14 @@ static int lan78xx_bind(struct lan78xx_n
	40	+@@ -2948,8 +2957,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-4.19/950-0128-lan78xx-Move-enabling-of-EEE-into-PHY-init-code.patch

+++ b/target/linux/bcm27xx/patches-4.19/950-0128-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		-@@ -2193,6 +2193,22 @@ static int lan78xx_phy_init(struct lan78
	19	+@@ -2195,6 +2195,22 @@ static int lan78xx_phy_init(struct lan78
20	20	mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control);
21	21	phydev->advertising \|= mii_adv_to_ethtool_adv_t(mii_adv);
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		-@@ -2670,22 +2686,6 @@ static int lan78xx_open(struct net_devic
	42	+@@ -2672,22 +2688,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-4.19/950-0150-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch

+++ b/target/linux/bcm27xx/patches-4.19/950-0150-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch

		@@ -23,7 +23,7 @@ Signed-off-by: Jiri Kosina <jkosina@suse.cz>
23	23
24	24	--- a/drivers/hid/Kconfig
25	25	+++ b/drivers/hid/Kconfig
26		-@@ -182,6 +182,19 @@ config HID_BETOP_FF
	26	+@@ -183,6 +183,19 @@ config HID_BETOP_FF
27	27	Currently the following devices are known to be supported:
28	28	- BETOP 2185 PC & BFM MODE
29	29

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

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

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

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

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

+++ b/target/linux/bcm27xx/patches-4.19/950-0316-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		-@@ -2198,7 +2198,7 @@ static int lan78xx_phy_init(struct lan78
	18	+@@ -2200,7 +2200,7 @@ static int lan78xx_phy_init(struct lan78
19	19	mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control);
20	20	phydev->advertising \|= mii_adv_to_ethtool_adv_t(mii_adv);
21	21

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

+++ b/target/linux/bcm27xx/patches-4.19/950-0413-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		-@@ -3193,7 +3193,7 @@ static int rx_submit(struct lan78xx_net
	15	+@@ -3195,7 +3195,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-4.19/950-0476-usb-xhci-Show-that-the-VIA-VL805-supports-LPM.patch

+++ b/target/linux/bcm27xx/patches-4.19/950-0476-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		-@@ -238,6 +238,10 @@ static void xhci_pci_quirks(struct devic
	13	+@@ -241,6 +241,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-4.19/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch

+++ b/target/linux/bcm27xx/patches-4.19/950-0609-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		-@@ -239,8 +239,10 @@ static void xhci_pci_quirks(struct devic
	26	+@@ -242,8 +242,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/generic/backport-4.14/291-v4.16-netfilter-core-remove-synchronize_net-call-if-nfqueu.patch

+++ b/target/linux/generic/backport-4.14/291-v4.16-netfilter-core-remove-synchronize_net-call-if-nfqueu.patch

		@@ -88,7 +88,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
88	88
89	89	--- a/net/netfilter/nfnetlink_queue.c
90	90	+++ b/net/netfilter/nfnetlink_queue.c
91		-@@ -941,23 +941,18 @@ static struct notifier_block nfqnl_dev_n
	91	+@@ -942,23 +942,18 @@ static struct notifier_block nfqnl_dev_n
92	92	.notifier_call = nfqnl_rcv_dev_event,
93	93	};
94	94

--- a/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch

+++ b/target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch

		@@ -44,7 +44,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
44	44	static int __init nf_tables_module_init(void)
45	45	--- a/net/netfilter/nfnetlink_log.c
46	46	+++ b/net/netfilter/nfnetlink_log.c
47		-@@ -1093,10 +1093,15 @@ static int __net_init nfnl_log_net_init(
	47	+@@ -1094,10 +1094,15 @@ static int __net_init nfnl_log_net_init(
48	48
49	49	static void __net_exit nfnl_log_net_exit(struct net *net)
50	50	{

		@@ -62,7 +62,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
62	62	static struct pernet_operations nfnl_log_net_ops = {
63	63	--- a/net/netfilter/nfnetlink_queue.c
64	64	+++ b/net/netfilter/nfnetlink_queue.c
65		-@@ -1510,10 +1510,15 @@ static int __net_init nfnl_queue_net_ini
	65	+@@ -1511,10 +1511,15 @@ static int __net_init nfnl_queue_net_ini
66	66
67	67	static void __net_exit nfnl_queue_net_exit(struct net *net)
68	68	{

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

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

		@@ -181,7 +181,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
181	181	cfg->fc_flags \|= RTF_REJECT;
182	182
183	183	if (rtm->rtm_type == RTN_LOCAL)
184		-@@ -3519,6 +3553,9 @@ static int rt6_fill_node(struct net *net
	184	+@@ -3543,6 +3577,9 @@ static int rt6_fill_node(struct net *net
185	185	case -EACCES:
186	186	rtm->rtm_type = RTN_PROHIBIT;
187	187	break;

		@@ -191,7 +191,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
191	191	case -EAGAIN:
192	192	rtm->rtm_type = RTN_THROW;
193	193	break;
194		-@@ -3837,6 +3874,8 @@ static int ip6_route_dev_notify(struct n
	194	+@@ -3861,6 +3898,8 @@ static int ip6_route_dev_notify(struct n
195	195	#ifdef CONFIG_IPV6_MULTIPLE_TABLES
196	196	net->ipv6.ip6_prohibit_entry->dst.dev = dev;
197	197	net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);

		@@ -200,7 +200,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
200	200	net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
201	201	net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
202	202	#endif
203		-@@ -3848,6 +3887,7 @@ static int ip6_route_dev_notify(struct n
	203	+@@ -3872,6 +3911,7 @@ static int ip6_route_dev_notify(struct n
204	204	in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
205	205	#ifdef CONFIG_IPV6_MULTIPLE_TABLES
206	206	in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);

		@@ -208,7 +208,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
208	208	in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
209	209	#endif
210	210	}
211		-@@ -4064,6 +4104,17 @@ static int __net_init ip6_route_net_init
	211	+@@ -4088,6 +4128,17 @@ static int __net_init ip6_route_net_init
212	212	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
213	213	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
214	214	ip6_template_metrics, true);

		@@ -226,7 +226,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
226	226	#endif
227	227
228	228	net->ipv6.sysctl.flush_delay = 0;
229		-@@ -4082,6 +4133,8 @@ out:
	229	+@@ -4106,6 +4157,8 @@ out:
230	230	return ret;
231	231
232	232	#ifdef CONFIG_IPV6_MULTIPLE_TABLES

		@@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
235	235	out_ip6_prohibit_entry:
236	236	kfree(net->ipv6.ip6_prohibit_entry);
237	237	out_ip6_null_entry:
238		-@@ -4099,6 +4152,7 @@ static void __net_exit ip6_route_net_exi
	238	+@@ -4123,6 +4176,7 @@ static void __net_exit ip6_route_net_exi
239	239	#ifdef CONFIG_IPV6_MULTIPLE_TABLES
240	240	kfree(net->ipv6.ip6_prohibit_entry);
241	241	kfree(net->ipv6.ip6_blk_hole_entry);

		@@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
243	243	#endif
244	244	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
245	245	}
246		-@@ -4172,6 +4226,9 @@ void __init ip6_route_init_special_entri
	246	+@@ -4196,6 +4250,9 @@ void __init ip6_route_init_special_entri
247	247	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
248	248	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
249	249	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);

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

+++ b/target/linux/generic/pending-4.19/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		-@@ -5100,6 +5131,8 @@ static int ip6_route_dev_notify(struct n
	188	+@@ -5124,6 +5155,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		-@@ -5111,6 +5144,7 @@ static int ip6_route_dev_notify(struct n
	197	+@@ -5135,6 +5168,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		-@@ -5305,6 +5339,15 @@ static int __net_init ip6_route_net_init
	205	+@@ -5329,6 +5363,15 @@ static int __net_init ip6_route_net_init
206	206	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
207	207	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
208	208	ip6_template_metrics, true);

		@@ -218,7 +218,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
218	218	#endif
219	219
220	220	net->ipv6.sysctl.flush_delay = 0;
221		-@@ -5323,6 +5366,8 @@ out:
	221	+@@ -5347,6 +5390,8 @@ out:
222	222	return ret;
223	223
224	224	#ifdef CONFIG_IPV6_MULTIPLE_TABLES

		@@ -227,7 +227,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
227	227	out_ip6_prohibit_entry:
228	228	kfree(net->ipv6.ip6_prohibit_entry);
229	229	out_ip6_null_entry:
230		-@@ -5343,6 +5388,7 @@ static void __net_exit ip6_route_net_exi
	230	+@@ -5367,6 +5412,7 @@ static void __net_exit ip6_route_net_exi
231	231	#ifdef CONFIG_IPV6_MULTIPLE_TABLES
232	232	kfree(net->ipv6.ip6_prohibit_entry);
233	233	kfree(net->ipv6.ip6_blk_hole_entry);

		@@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
235	235	#endif
236	236	dst_entries_destroy(&net->ipv6.ip6_dst_ops);
237	237	}
238		-@@ -5419,6 +5465,9 @@ void __init ip6_route_init_special_entri
	238	+@@ -5443,6 +5489,9 @@ void __init ip6_route_init_special_entri
239	239	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
240	240	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
241	241	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);

--- a/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch

+++ b/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch

		@@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
86	86	if (!xhci->shared_hcd) {
87	87	--- a/drivers/usb/host/xhci-pci.c
88	88	+++ b/drivers/usb/host/xhci-pci.c
89		-@@ -293,6 +293,9 @@ static int xhci_pci_setup(struct usb_hcd
	89	+@@ -296,6 +296,9 @@ static int xhci_pci_setup(struct usb_hcd
90	90	if (!xhci->sbrn)
91	91	pci_read_config_byte(pdev, XHCI_SBRN_OFFSET, &xhci->sbrn);
92	92

Show on old repository browser