forked from coolsnowwolf/lede
-
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.
All patch automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <[email protected]>
- Loading branch information
Showing
15 changed files
with
34 additions
and
119 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 = .46 | ||
LINUX_KERNEL_HASH-6.6.46 = 052f932396d9c7d84ceeda91226a8ef797c12188bde41e6c419602d990dd45f2 | ||
LINUX_VERSION-6.6 = .50 | ||
LINUX_KERNEL_HASH-6.6.50 = c065e36daf28210060c91a37ef3e92ac5814784e634577e04e406297ead2e86e |
26 changes: 0 additions & 26 deletions
26
...neric/backport-6.6/752-04-v6.6-net-ethernet-mtk_wed-check-update_wo_rx_stats-in-mtk.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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -168,7 +168,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
ext_mask |= MTK_WED_EXT_INT_STATUS_TX_DRV_R_RESP_ERR; | ||
else | ||
ext_mask |= MTK_WED_EXT_INT_STATUS_RX_FBUF_LO_TH | | ||
@@ -1840,7 +1840,7 @@ mtk_wed_setup_tc(struct mtk_wed_device * | ||
@@ -1842,7 +1842,7 @@ mtk_wed_setup_tc(struct mtk_wed_device * | ||
{ | ||
struct mtk_wed_hw *hw = wed->hw; | ||
|
||
|
@@ -177,7 +177,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
return -EOPNOTSUPP; | ||
|
||
switch (type) { | ||
@@ -1914,9 +1914,9 @@ void mtk_wed_add_hw(struct device_node * | ||
@@ -1916,9 +1916,9 @@ void mtk_wed_add_hw(struct device_node * | ||
hw->wdma = wdma; | ||
hw->index = index; | ||
hw->irq = irq; | ||
|
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 |
---|---|---|
|
@@ -142,7 +142,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
return -ENOMEM; | ||
|
||
wdma_w32(dev, MTK_WDMA_RING_TX(idx) + MTK_WED_RING_OFS_BASE, | ||
@@ -1928,7 +1935,12 @@ void mtk_wed_add_hw(struct device_node * | ||
@@ -1930,7 +1937,12 @@ void mtk_wed_add_hw(struct device_node * | ||
hw->irq = irq; | ||
hw->version = eth->soc->version; | ||
|
||
|
@@ -156,7 +156,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
hw->mirror = syscon_regmap_lookup_by_phandle(eth_np, | ||
"mediatek,pcie-mirror"); | ||
hw->hifsys = syscon_regmap_lookup_by_phandle(eth_np, | ||
@@ -1942,6 +1954,8 @@ void mtk_wed_add_hw(struct device_node * | ||
@@ -1944,6 +1956,8 @@ void mtk_wed_add_hw(struct device_node * | ||
regmap_write(hw->mirror, 0, 0); | ||
regmap_write(hw->mirror, 4, 0); | ||
} | ||
|
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 |
---|---|---|
|
@@ -759,7 +759,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
|
||
val = wed_r32(dev, MTK_WED_EXT_INT_STATUS); | ||
wed_w32(dev, MTK_WED_EXT_INT_STATUS, val); | ||
@@ -1939,6 +2130,9 @@ void mtk_wed_add_hw(struct device_node * | ||
@@ -1941,6 +2132,9 @@ void mtk_wed_add_hw(struct device_node * | ||
case 2: | ||
hw->soc = &mt7986_data; | ||
break; | ||
|
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 |
---|---|---|
|
@@ -364,7 +364,7 @@ Signed-off-by: Paolo Abeni <[email protected]> | |
mtk_wed_start(struct mtk_wed_device *dev, u32 irq_mask) | ||
{ | ||
int i; | ||
@@ -2212,6 +2503,10 @@ void mtk_wed_add_hw(struct device_node * | ||
@@ -2214,6 +2505,10 @@ void mtk_wed_add_hw(struct device_node * | ||
.detach = mtk_wed_detach, | ||
.ppe_check = mtk_wed_ppe_check, | ||
.setup_tc = mtk_wed_setup_tc, | ||
|
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 |
---|---|---|
|
@@ -123,7 +123,7 @@ Signed-off-by: Justin Stitt <[email protected]> | |
#endif /* _LINUX_ETHTOOL_H */ | ||
--- a/net/ethtool/ioctl.c | ||
+++ b/net/ethtool/ioctl.c | ||
@@ -1991,6 +1991,13 @@ __printf(2, 3) void ethtool_sprintf(u8 * | ||
@@ -1994,6 +1994,13 @@ __printf(2, 3) void ethtool_sprintf(u8 * | ||
} | ||
EXPORT_SYMBOL(ethtool_sprintf); | ||
|
||
|
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
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 |
---|---|---|
|
@@ -131,7 +131,7 @@ Signed-off-by: John Crispin <[email protected]> | |
struct gpio_desc *desc) | ||
--- a/drivers/gpio/gpiolib-sysfs.c | ||
+++ b/drivers/gpio/gpiolib-sysfs.c | ||
@@ -557,7 +557,7 @@ static struct class gpio_class = { | ||
@@ -558,7 +558,7 @@ static struct class gpio_class = { | ||
* | ||
* Returns zero on success, else an error. | ||
*/ | ||
|
@@ -140,7 +140,7 @@ Signed-off-by: John Crispin <[email protected]> | |
{ | ||
struct gpio_chip *chip; | ||
struct gpio_device *gdev; | ||
@@ -619,6 +619,8 @@ int gpiod_export(struct gpio_desc *desc, | ||
@@ -620,6 +620,8 @@ int gpiod_export(struct gpio_desc *desc, | ||
offset = gpio_chip_hwgpio(desc); | ||
if (chip->names && chip->names[offset]) | ||
ioname = chip->names[offset]; | ||
|
@@ -149,7 +149,7 @@ Signed-off-by: John Crispin <[email protected]> | |
|
||
dev = device_create_with_groups(&gpio_class, &gdev->dev, | ||
MKDEV(0, 0), data, gpio_groups, | ||
@@ -640,8 +642,21 @@ err_unlock: | ||
@@ -641,8 +643,21 @@ err_unlock: | ||
gpiod_dbg(desc, "%s: status %d\n", __func__, status); | ||
return status; | ||
} | ||
|
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 |
---|---|---|
|
@@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
if (!pe) | ||
--- a/mm/vmalloc.c | ||
+++ b/mm/vmalloc.c | ||
@@ -4455,6 +4455,8 @@ static const struct seq_operations vmall | ||
@@ -4448,6 +4448,8 @@ static const struct seq_operations vmall | ||
|
||
static int __init proc_vmalloc_init(void) | ||
{ | ||
|
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 |
---|---|---|
|
@@ -338,7 +338,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6)) | ||
return -1; | ||
|
||
@@ -1543,6 +1704,14 @@ ip6_tnl_change(struct ip6_tnl *t, const | ||
@@ -1544,6 +1705,14 @@ ip6_tnl_change(struct ip6_tnl *t, const | ||
t->parms.link = p->link; | ||
t->parms.proto = p->proto; | ||
t->parms.fwmark = p->fwmark; | ||
|
@@ -353,15 +353,15 @@ Signed-off-by: Steven Barth <[email protected]> | |
dst_cache_reset(&t->dst_cache); | ||
ip6_tnl_link_config(t); | ||
} | ||
@@ -1577,6 +1746,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ | ||
@@ -1578,6 +1747,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_ | ||
p->flowinfo = u->flowinfo; | ||
p->link = u->link; | ||
p->proto = u->proto; | ||
+ p->fmrs = NULL; | ||
memcpy(p->name, u->name, sizeof(u->name)); | ||
} | ||
|
||
@@ -1964,6 +2134,15 @@ static int ip6_tnl_validate(struct nlatt | ||
@@ -1966,6 +2136,15 @@ static int ip6_tnl_validate(struct nlatt | ||
return 0; | ||
} | ||
|
||
|
@@ -377,7 +377,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
static void ip6_tnl_netlink_parms(struct nlattr *data[], | ||
struct __ip6_tnl_parm *parms) | ||
{ | ||
@@ -2001,6 +2180,46 @@ static void ip6_tnl_netlink_parms(struct | ||
@@ -2003,6 +2182,46 @@ static void ip6_tnl_netlink_parms(struct | ||
|
||
if (data[IFLA_IPTUN_FWMARK]) | ||
parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]); | ||
|
@@ -424,7 +424,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
} | ||
|
||
static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev, | ||
@@ -2084,6 +2303,12 @@ static void ip6_tnl_dellink(struct net_d | ||
@@ -2086,6 +2305,12 @@ static void ip6_tnl_dellink(struct net_d | ||
|
||
static size_t ip6_tnl_get_size(const struct net_device *dev) | ||
{ | ||
|
@@ -437,7 +437,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
return | ||
/* IFLA_IPTUN_LINK */ | ||
nla_total_size(4) + | ||
@@ -2113,6 +2338,24 @@ static size_t ip6_tnl_get_size(const str | ||
@@ -2115,6 +2340,24 @@ static size_t ip6_tnl_get_size(const str | ||
nla_total_size(0) + | ||
/* IFLA_IPTUN_FWMARK */ | ||
nla_total_size(4) + | ||
|
@@ -462,7 +462,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
0; | ||
} | ||
|
||
@@ -2120,6 +2363,9 @@ static int ip6_tnl_fill_info(struct sk_b | ||
@@ -2122,6 +2365,9 @@ static int ip6_tnl_fill_info(struct sk_b | ||
{ | ||
struct ip6_tnl *tunnel = netdev_priv(dev); | ||
struct __ip6_tnl_parm *parm = &tunnel->parms; | ||
|
@@ -472,7 +472,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
|
||
if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) || | ||
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) || | ||
@@ -2129,9 +2375,27 @@ static int ip6_tnl_fill_info(struct sk_b | ||
@@ -2131,9 +2377,27 @@ static int ip6_tnl_fill_info(struct sk_b | ||
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) || | ||
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) || | ||
nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) || | ||
|
@@ -501,7 +501,7 @@ Signed-off-by: Steven Barth <[email protected]> | |
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) || | ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) || | ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) || | ||
@@ -2171,6 +2435,7 @@ static const struct nla_policy ip6_tnl_p | ||
@@ -2173,6 +2437,7 @@ static const struct nla_policy ip6_tnl_p | ||
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, | ||
[IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG }, | ||
[IFLA_IPTUN_FWMARK] = { .type = NLA_U32 }, | ||
|
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 |
---|---|---|
|
@@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <[email protected]> | |
|
||
--- a/net/netfilter/nf_tables_api.c | ||
+++ b/net/netfilter/nf_tables_api.c | ||
@@ -8279,7 +8279,7 @@ static int nft_register_flowtable_net_ho | ||
@@ -8322,7 +8322,7 @@ static int nft_register_flowtable_net_ho | ||
err = flowtable->data.type->setup(&flowtable->data, | ||
hook->ops.dev, | ||
FLOW_BLOCK_BIND); | ||
|
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
59 changes: 0 additions & 59 deletions
59
...linux/mediatek/patches-6.6/951-net-ethernet-mtk_wed-fix-use-after-free-panic-in-mtk.patch
This file was deleted.
Oops, something went wrong.