forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.35 Removed upstreamed: bcm27xx/patches-6.6/950-1135-ax25-Fix-refcount-imbalance-on-inbound-connections.patch[1] Removed no longer needed: generic/pending-6.6/779-net-vxlan-don-t-learn-non-unicast-L2-destinations.patch[2] All other patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/glinet_gl-mt6000, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.35&id=52100fd74ad07b53a4666feafff1cd11436362d3 2. As suggested by @DragonBluep, "This patch can be removed. It will never return false. And the upstream commit should fix the same issue: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit?h=v6.6.35&id=924f7bbfc5cfd029e417c56357ca01eae681fba6" Signed-off-by: John Audia <[email protected]>
- Loading branch information
Showing
15 changed files
with
35 additions
and
150 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
LINUX_VERSION-6.6 = .34 | ||
LINUX_KERNEL_HASH-6.6.34 = c4e0ec8f593aa3717e85abad940466e7d7cbc362989426eb37f499330a461ba0 | ||
LINUX_VERSION-6.6 = .35 | ||
LINUX_KERNEL_HASH-6.6.35 = fce3ee728712ed063aa8c14a8756c8ff8c7a46ba3827f61d2b04a73c7cf5dd9e |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,7 +52,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
erst_base = xhci_read_64(xhci, &ir->ir_set->erst_base); | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1679,8 +1679,9 @@ struct urb_priv { | ||
@@ -1680,8 +1680,9 @@ struct urb_priv { | ||
* Each segment table entry is 4*32bits long. 1K seems like an ok size: | ||
* (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table, | ||
* meaning 64 ring segments. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,7 +24,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/usb/host/xhci-pci.c | ||
+++ b/drivers/usb/host/xhci-pci.c | ||
@@ -482,6 +482,7 @@ static void xhci_pci_quirks(struct devic | ||
@@ -489,6 +489,7 @@ static void xhci_pci_quirks(struct devic | ||
if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) { | ||
xhci->quirks |= XHCI_LPM_SUPPORT; | ||
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; | ||
|
@@ -52,7 +52,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
addr = xhci_trb_virt_to_dma(new_seg, new_deq); | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1914,6 +1914,9 @@ struct xhci_hcd { | ||
@@ -1915,6 +1915,9 @@ struct xhci_hcd { | ||
#define XHCI_ZHAOXIN_TRB_FETCH BIT_ULL(45) | ||
#define XHCI_ZHAOXIN_HOST BIT_ULL(46) | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
|
||
--- a/drivers/usb/host/xhci-pci.c | ||
+++ b/drivers/usb/host/xhci-pci.c | ||
@@ -483,6 +483,7 @@ static void xhci_pci_quirks(struct devic | ||
@@ -490,6 +490,7 @@ static void xhci_pci_quirks(struct devic | ||
xhci->quirks |= XHCI_LPM_SUPPORT; | ||
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; | ||
xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -90,7 +90,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
/* Allow 3 retries for everything but isoc, set CErr = 3 */ | ||
--- a/drivers/usb/host/xhci-pci.c | ||
+++ b/drivers/usb/host/xhci-pci.c | ||
@@ -484,6 +484,7 @@ static void xhci_pci_quirks(struct devic | ||
@@ -491,6 +491,7 @@ static void xhci_pci_quirks(struct devic | ||
xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; | ||
xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; | ||
xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH; | ||
|
@@ -100,7 +100,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1916,6 +1916,7 @@ struct xhci_hcd { | ||
@@ -1917,6 +1917,7 @@ struct xhci_hcd { | ||
|
||
/* Downstream VLI fixes */ | ||
#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(56) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,7 +47,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
/* Device for a quirk */ | ||
#define PCI_VENDOR_ID_FRESCO_LOGIC 0x1b73 | ||
#define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000 | ||
@@ -290,6 +292,16 @@ static int xhci_pci_reinit(struct xhci_h | ||
@@ -291,6 +293,16 @@ static int xhci_pci_reinit(struct xhci_h | ||
return 0; | ||
} | ||
|
||
|
@@ -64,7 +64,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) | ||
{ | ||
struct pci_dev *pdev = to_pci_dev(dev); | ||
@@ -485,6 +497,8 @@ static void xhci_pci_quirks(struct devic | ||
@@ -492,6 +504,8 @@ static void xhci_pci_quirks(struct devic | ||
xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; | ||
xhci->quirks |= XHCI_ZHAOXIN_TRB_FETCH; | ||
xhci->quirks |= XHCI_VLI_SS_BULK_OUT_BUG; | ||
|
@@ -75,7 +75,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && | ||
--- a/drivers/usb/host/xhci-ring.c | ||
+++ b/drivers/usb/host/xhci-ring.c | ||
@@ -3626,6 +3626,48 @@ static int xhci_align_td(struct xhci_hcd | ||
@@ -3657,6 +3657,48 @@ static int xhci_align_td(struct xhci_hcd | ||
return 1; | ||
} | ||
|
||
|
@@ -124,7 +124,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
/* This is very similar to what ehci-q.c qtd_fill() does */ | ||
int xhci_queue_bulk_tx(struct xhci_hcd *xhci, gfp_t mem_flags, | ||
struct urb *urb, int slot_id, unsigned int ep_index) | ||
@@ -3782,6 +3824,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | ||
@@ -3813,6 +3855,8 @@ int xhci_queue_bulk_tx(struct xhci_hcd * | ||
} | ||
|
||
check_trb_math(urb, enqd_len); | ||
|
@@ -133,7 +133,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
giveback_first_trb(xhci, slot_id, ep_index, urb->stream_id, | ||
start_cycle, start_trb); | ||
return 0; | ||
@@ -3917,6 +3961,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * | ||
@@ -3948,6 +3992,8 @@ int xhci_queue_ctrl_tx(struct xhci_hcd * | ||
/* Event on completion */ | ||
field | TRB_IOC | TRB_TYPE(TRB_STATUS) | ep_ring->cycle_state); | ||
|
||
|
@@ -144,7 +144,7 @@ Signed-off-by: Jonathan Bell <[email protected]> | |
return 0; | ||
--- a/drivers/usb/host/xhci.h | ||
+++ b/drivers/usb/host/xhci.h | ||
@@ -1917,6 +1917,7 @@ struct xhci_hcd { | ||
@@ -1918,6 +1918,7 @@ struct xhci_hcd { | ||
/* Downstream VLI fixes */ | ||
#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(56) | ||
#define XHCI_VLI_SS_BULK_OUT_BUG BIT_ULL(57) | ||
|
85 changes: 0 additions & 85 deletions
85
...nux/bcm27xx/patches-6.6/950-1135-ax25-Fix-refcount-imbalance-on-inbound-connections.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -141,7 +141,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
if (err) | ||
--- a/scripts/mod/modpost.c | ||
+++ b/scripts/mod/modpost.c | ||
@@ -1692,7 +1692,9 @@ static void read_symbols(const char *mod | ||
@@ -1693,7 +1693,9 @@ static void read_symbols(const char *mod | ||
symname = remove_dot(info.strtab + sym->st_name); | ||
|
||
handle_symbol(mod, &info, sym, symname); | ||
|
@@ -151,7 +151,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
} | ||
|
||
check_sec_ref(mod, &info); | ||
@@ -1865,8 +1867,10 @@ static void add_header(struct buffer *b, | ||
@@ -1866,8 +1868,10 @@ static void add_header(struct buffer *b, | ||
buf_printf(b, "BUILD_SALT;\n"); | ||
buf_printf(b, "BUILD_LTO_INFO;\n"); | ||
buf_printf(b, "\n"); | ||
|
@@ -162,7 +162,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
buf_printf(b, "\n"); | ||
buf_printf(b, "__visible struct module __this_module\n"); | ||
buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n"); | ||
@@ -1880,8 +1884,10 @@ static void add_header(struct buffer *b, | ||
@@ -1881,8 +1885,10 @@ static void add_header(struct buffer *b, | ||
buf_printf(b, "\t.arch = MODULE_ARCH_INIT,\n"); | ||
buf_printf(b, "};\n"); | ||
|
||
|
@@ -173,7 +173,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
buf_printf(b, | ||
"\n" | ||
@@ -1889,8 +1895,10 @@ static void add_header(struct buffer *b, | ||
@@ -1890,8 +1896,10 @@ static void add_header(struct buffer *b, | ||
"MODULE_INFO(retpoline, \"Y\");\n" | ||
"#endif\n"); | ||
|
||
|
@@ -184,7 +184,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
if (strstarts(mod->name, "tools/testing")) | ||
buf_printf(b, "\nMODULE_INFO(test, \"Y\");\n"); | ||
@@ -2000,11 +2008,13 @@ static void add_depends(struct buffer *b | ||
@@ -2001,11 +2009,13 @@ static void add_depends(struct buffer *b | ||
|
||
static void add_srcversion(struct buffer *b, struct module *mod) | ||
{ | ||
|
@@ -198,7 +198,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
} | ||
|
||
static void write_buf(struct buffer *b, const char *fname) | ||
@@ -2087,7 +2097,9 @@ static void write_mod_c_file(struct modu | ||
@@ -2088,7 +2098,9 @@ static void write_mod_c_file(struct modu | ||
add_exported_symbols(&buf, mod); | ||
add_versions(&buf, mod); | ||
add_depends(&buf, mod); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -36,7 +36,7 @@ Signed-off-by: Daniel Golle <[email protected]> | |
// Lantech 8330-262D-E can operate at 2500base-X, but incorrectly report | ||
// 2500MBd NRZ in their EEPROM | ||
SFP_QUIRK_M("Lantech", "8330-262D-E", sfp_quirk_2500basex), | ||
@@ -2587,7 +2590,8 @@ static void sfp_sm_main(struct sfp *sfp, | ||
@@ -2586,7 +2589,8 @@ static void sfp_sm_main(struct sfp *sfp, | ||
* or t_start_up, so assume there is a fault. | ||
*/ | ||
sfp_sm_fault(sfp, SFP_S_INIT_TX_FAULT, | ||
|
@@ -46,7 +46,7 @@ Signed-off-by: Daniel Golle <[email protected]> | |
} else if (event == SFP_E_TIMEOUT || event == SFP_E_TX_CLEAR) { | ||
init_done: | ||
/* Create mdiobus and start trying for PHY */ | ||
@@ -2841,10 +2845,12 @@ static void sfp_check_state(struct sfp * | ||
@@ -2840,10 +2844,12 @@ static void sfp_check_state(struct sfp * | ||
mutex_lock(&sfp->st_mutex); | ||
state = sfp_get_state(sfp); | ||
changed = state ^ sfp->state; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -157,7 +157,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
case RTN_THROW: | ||
case RTN_UNREACHABLE: | ||
default: | ||
@@ -4543,6 +4562,17 @@ static int ip6_pkt_prohibit_out(struct n | ||
@@ -4544,6 +4563,17 @@ static int ip6_pkt_prohibit_out(struct n | ||
return ip6_pkt_drop(skb, ICMPV6_ADM_PROHIBITED, IPSTATS_MIB_OUTNOROUTES); | ||
} | ||
|
||
|
@@ -175,7 +175,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
/* | ||
* Allocate a dst for local (unicast / anycast) address. | ||
*/ | ||
@@ -5034,7 +5064,8 @@ static int rtm_to_fib6_config(struct sk_ | ||
@@ -5035,7 +5065,8 @@ static int rtm_to_fib6_config(struct sk_ | ||
if (rtm->rtm_type == RTN_UNREACHABLE || | ||
rtm->rtm_type == RTN_BLACKHOLE || | ||
rtm->rtm_type == RTN_PROHIBIT || | ||
|
@@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
cfg->fc_flags |= RTF_REJECT; | ||
|
||
if (rtm->rtm_type == RTN_LOCAL) | ||
@@ -6281,6 +6312,8 @@ static int ip6_route_dev_notify(struct n | ||
@@ -6282,6 +6313,8 @@ static int ip6_route_dev_notify(struct n | ||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
net->ipv6.ip6_prohibit_entry->dst.dev = dev; | ||
net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); | ||
|
@@ -194,15 +194,15 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
net->ipv6.ip6_blk_hole_entry->dst.dev = dev; | ||
net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); | ||
#endif | ||
@@ -6292,6 +6325,7 @@ static int ip6_route_dev_notify(struct n | ||
@@ -6293,6 +6326,7 @@ static int ip6_route_dev_notify(struct n | ||
in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev); | ||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev); | ||
+ in6_dev_put_clear(&net->ipv6.ip6_policy_failed_entry->rt6i_idev); | ||
in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev); | ||
#endif | ||
} | ||
@@ -6492,6 +6526,8 @@ static int __net_init ip6_route_net_init | ||
@@ -6493,6 +6527,8 @@ static int __net_init ip6_route_net_init | ||
|
||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
net->ipv6.fib6_has_custom_rules = false; | ||
|
@@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template, | ||
sizeof(*net->ipv6.ip6_prohibit_entry), | ||
GFP_KERNEL); | ||
@@ -6502,11 +6538,21 @@ static int __net_init ip6_route_net_init | ||
@@ -6503,11 +6539,21 @@ static int __net_init ip6_route_net_init | ||
ip6_template_metrics, true); | ||
INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->dst.rt_uncached); | ||
|
||
|
@@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; | ||
dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, | ||
ip6_template_metrics, true); | ||
@@ -6533,6 +6579,8 @@ out: | ||
@@ -6534,6 +6580,8 @@ out: | ||
return ret; | ||
|
||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
|
@@ -243,15 +243,15 @@ Signed-off-by: Jonas Gorski <[email protected]> | |
out_ip6_prohibit_entry: | ||
kfree(net->ipv6.ip6_prohibit_entry); | ||
out_ip6_null_entry: | ||
@@ -6552,6 +6600,7 @@ static void __net_exit ip6_route_net_exi | ||
@@ -6553,6 +6601,7 @@ static void __net_exit ip6_route_net_exi | ||
kfree(net->ipv6.ip6_null_entry); | ||
#ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||
kfree(net->ipv6.ip6_prohibit_entry); | ||
+ kfree(net->ipv6.ip6_policy_failed_entry); | ||
kfree(net->ipv6.ip6_blk_hole_entry); | ||
#endif | ||
dst_entries_destroy(&net->ipv6.ip6_dst_ops); | ||
@@ -6635,6 +6684,9 @@ void __init ip6_route_init_special_entri | ||
@@ -6636,6 +6685,9 @@ void __init ip6_route_init_special_entri | ||
init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); | ||
init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; | ||
init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); | ||
|
Oops, something went wrong.