• R/O
  • HTTP
  • SSH
  • HTTPS

immortalwrt: Commit

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


Commit MetaInfo

Revisão3d6248d855ab19f1050bf1c0004f6aa1d8601fcc (tree)
Hora2022-01-25 20:40:05
AutorTianling Shen <cnsztl@immo...>
CommiterTianling 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
66 KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
77 endif
88
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
1212
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
1616
1717 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
1818 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>
4444
4545 #include "xhci.h"
4646 #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
4848 static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
4949 #endif /* CONFIG_ACPI */
5050
@@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
503503 /* called during probe() after chip reset completes */
504504 static int xhci_pci_setup(struct usb_hcd *hcd)
505505 {
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
507507 struct hc_driver *driver;
508508 struct usb_hcd *hcd;
509509
@@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
526526 driver = (struct hc_driver *)id->driver_data;
527527
528528 /* 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
530530 {
531531 struct xhci_hcd *xhci;
532532
--- 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.
1313
1414 --- a/drivers/usb/host/xhci-pci.c
1515 +++ 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
1717 xhci->quirks |= XHCI_TRUST_TX_LENGTH;
1818 if (pdev->vendor == PCI_VENDOR_ID_RENESAS &&
1919 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>
4444
4545 #include "xhci.h"
4646 #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
4848 static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { }
4949 #endif /* CONFIG_ACPI */
5050
@@ -503,7 +503,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
503503 /* called during probe() after chip reset completes */
504504 static int xhci_pci_setup(struct usb_hcd *hcd)
505505 {
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
507507 struct hc_driver *driver;
508508 struct usb_hcd *hcd;
509509
@@ -526,7 +526,7 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
526526 driver = (struct hc_driver *)id->driver_data;
527527
528528 /* 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
530530 {
531531 struct xhci_hcd *xhci;
532532
--- 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.
1313
1414 --- a/drivers/usb/host/xhci-pci.c
1515 +++ 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
1717 pdev->device == 0x0015) {
1818 xhci->quirks |= XHCI_RESET_ON_RESUME;
1919 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>
1414
1515 --- a/drivers/net/usb/lan78xx.c
1616 +++ 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_
1818 int ret = 0;
1919 unsigned long timeout;
2020 u8 sig;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
2626
2727 ret = lan78xx_read_reg(dev, HW_CFG, &buf);
2828 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_
3030
3131 ret = lan78xx_read_reg(dev, HW_CFG, &buf);
3232 buf |= HW_CFG_MEF_;
@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
3636 ret = lan78xx_write_reg(dev, HW_CFG, buf);
3737
3838 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_
4040 buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
4141 }
4242 }
--- 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>
1515
1616 --- a/drivers/net/usb/lan78xx.c
1717 +++ 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
1919
2020 netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
2121
--- 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>
2121
2222 --- a/drivers/net/usb/lan78xx.c
2323 +++ 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;
2525 module_param(msg_level, int, 0);
2626 MODULE_PARM_DESC(msg_level, "Override default message level");
2727
@@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
3737 static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
3838 {
3939 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
4141 if (DEFAULT_RX_CSUM_ENABLE)
4242 dev->net->features |= NETIF_F_RXCSUM;
4343
--- 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>
1616
1717 --- a/drivers/net/usb/lan78xx.c
1818 +++ 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
2020 mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control);
2121 phydev->advertising |= mii_adv_to_ethtool_adv_t(mii_adv);
2222
@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
3939 if (phydev->mdio.dev.of_node) {
4040 u32 reg;
4141 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
4343
4444 netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
4545
--- 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>
2323
2424 --- a/drivers/hid/Kconfig
2525 +++ b/drivers/hid/Kconfig
26-@@ -182,6 +182,19 @@ config HID_BETOP_FF
26+@@ -183,6 +183,19 @@ config HID_BETOP_FF
2727 Currently the following devices are known to be supported:
2828 - BETOP 2185 PC & BFM MODE
2929
--- 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>
1515
1616 --- a/drivers/net/usb/lan78xx.c
1717 +++ 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
1919 mii_adv = (u32)mii_advertise_flowctrl(dev->fc_request_control);
2020 phydev->advertising |= mii_adv_to_ethtool_adv_t(mii_adv);
2121
--- 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.
1212
1313 --- a/drivers/net/usb/lan78xx.c
1414 +++ 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
1616 size_t size = dev->rx_urb_size;
1717 int ret = 0;
1818
--- 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>
1010
1111 --- a/drivers/usb/host/xhci-pci.c
1212 +++ 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
1414 pdev->device == 0x3432)
1515 xhci->quirks |= XHCI_BROKEN_STREAMS;
1616
--- 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>
2323
2424 --- a/drivers/usb/host/xhci-pci.c
2525 +++ 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
2727 xhci->quirks |= XHCI_BROKEN_STREAMS;
2828
2929 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>
8888
8989 --- a/net/netfilter/nfnetlink_queue.c
9090 +++ 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
9292 .notifier_call = nfqnl_rcv_dev_event,
9393 };
9494
--- 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>
4444 static int __init nf_tables_module_init(void)
4545 --- a/net/netfilter/nfnetlink_log.c
4646 +++ 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(
4848
4949 static void __net_exit nfnl_log_net_exit(struct net *net)
5050 {
@@ -62,7 +62,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
6262 static struct pernet_operations nfnl_log_net_ops = {
6363 --- a/net/netfilter/nfnetlink_queue.c
6464 +++ 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
6666
6767 static void __net_exit nfnl_queue_net_exit(struct net *net)
6868 {
--- 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>
181181 cfg->fc_flags |= RTF_REJECT;
182182
183183 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
185185 case -EACCES:
186186 rtm->rtm_type = RTN_PROHIBIT;
187187 break;
@@ -191,7 +191,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
191191 case -EAGAIN:
192192 rtm->rtm_type = RTN_THROW;
193193 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
195195 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
196196 net->ipv6.ip6_prohibit_entry->dst.dev = dev;
197197 net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -200,7 +200,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
200200 net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
201201 net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
202202 #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
204204 in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
205205 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
206206 in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
@@ -208,7 +208,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
208208 in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
209209 #endif
210210 }
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
212212 net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
213213 dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
214214 ip6_template_metrics, true);
@@ -226,7 +226,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
226226 #endif
227227
228228 net->ipv6.sysctl.flush_delay = 0;
229-@@ -4082,6 +4133,8 @@ out:
229+@@ -4106,6 +4157,8 @@ out:
230230 return ret;
231231
232232 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
235235 out_ip6_prohibit_entry:
236236 kfree(net->ipv6.ip6_prohibit_entry);
237237 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
239239 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
240240 kfree(net->ipv6.ip6_prohibit_entry);
241241 kfree(net->ipv6.ip6_blk_hole_entry);
@@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
243243 #endif
244244 dst_entries_destroy(&net->ipv6.ip6_dst_ops);
245245 }
246-@@ -4172,6 +4226,9 @@ void __init ip6_route_init_special_entri
246+@@ -4196,6 +4250,9 @@ void __init ip6_route_init_special_entri
247247 init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
248248 init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
249249 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>
185185 cfg->fc_flags |= RTF_REJECT;
186186
187187 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
189189 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
190190 net->ipv6.ip6_prohibit_entry->dst.dev = dev;
191191 net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev);
@@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
194194 net->ipv6.ip6_blk_hole_entry->dst.dev = dev;
195195 net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev);
196196 #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
198198 in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev);
199199 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
200200 in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev);
@@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
202202 in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev);
203203 #endif
204204 }
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
206206 net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops;
207207 dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst,
208208 ip6_template_metrics, true);
@@ -218,7 +218,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
218218 #endif
219219
220220 net->ipv6.sysctl.flush_delay = 0;
221-@@ -5323,6 +5366,8 @@ out:
221+@@ -5347,6 +5390,8 @@ out:
222222 return ret;
223223
224224 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
@@ -227,7 +227,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
227227 out_ip6_prohibit_entry:
228228 kfree(net->ipv6.ip6_prohibit_entry);
229229 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
231231 #ifdef CONFIG_IPV6_MULTIPLE_TABLES
232232 kfree(net->ipv6.ip6_prohibit_entry);
233233 kfree(net->ipv6.ip6_blk_hole_entry);
@@ -235,7 +235,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
235235 #endif
236236 dst_entries_destroy(&net->ipv6.ip6_dst_ops);
237237 }
238-@@ -5419,6 +5465,9 @@ void __init ip6_route_init_special_entri
238+@@ -5443,6 +5489,9 @@ void __init ip6_route_init_special_entri
239239 init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev);
240240 init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev;
241241 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>
8686 if (!xhci->shared_hcd) {
8787 --- a/drivers/usb/host/xhci-pci.c
8888 +++ 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
9090 if (!xhci->sbrn)
9191 pci_read_config_byte(pdev, XHCI_SBRN_OFFSET, &xhci->sbrn);
9292
Show on old repository browser