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.
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: kernel: kmod-ipt-ulog: Remove package rockchip: fix opc-h68k tf boot fail on some cards dnsmasq: bump to v2.8.7 silicon: fix kernel target kernel: Refresh kernel 5.10 kernel: refresh linux 6.1 patches treewide: remove kernel 6.0 support sunxi: add kernel 5.10 support mac80211: backport ath11k in linux kernel 6.1
- Loading branch information
Showing
209 changed files
with
1,328 additions
and
38,838 deletions.
There are no files selected for viewing
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
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
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
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
45 changes: 45 additions & 0 deletions
45
package/kernel/mac80211/patches/ath11k/902-ath11k-linux-6.1-support.patch
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 |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| --- a/drivers/net/wireless/ath/ath11k/pci.c | ||
| --- b/drivers/net/wireless/ath/ath11k/pci.c | ||
| @@ -427,7 +427,11 @@ | ||
| pci_read_config_dword(pci_dev, pci_dev->msi_cap + PCI_MSI_ADDRESS_LO, | ||
| &ab->pci.msi.addr_lo); | ||
|
|
||
| +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) | ||
| if (msi_desc->msi_attrib.is_64) { | ||
| +#else | ||
| + if (msi_desc->pci.msi_attrib.is_64) { | ||
| +#endif | ||
| pci_read_config_dword(pci_dev, pci_dev->msi_cap + PCI_MSI_ADDRESS_HI, | ||
| &ab->pci.msi.addr_hi); | ||
| } else { | ||
| --- a/drivers/net/wireless/ath/ath11k/pcic.c | ||
| +++ b/drivers/net/wireless/ath/ath11k/pcic.c | ||
| @@ -548,8 +548,13 @@ | ||
| irq_grp->ab = ab; | ||
| irq_grp->grp_id = i; | ||
| init_dummy_netdev(&irq_grp->napi_ndev); | ||
| +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) | ||
| netif_napi_add(&irq_grp->napi_ndev, &irq_grp->napi, | ||
| ath11k_pcic_ext_grp_napi_poll, NAPI_POLL_WEIGHT); | ||
| +#else | ||
| + netif_napi_add_weight(&irq_grp->napi_ndev, &irq_grp->napi, | ||
| + ath11k_pcic_ext_grp_napi_poll, NAPI_POLL_WEIGHT); | ||
| +#endif | ||
|
|
||
| if (ab->hw_params.ring_mask->tx[i] || | ||
| ab->hw_params.ring_mask->rx[i] || | ||
| --- a/net/qrtr/qrtr.c | ||
| +++ b/net/qrtr/qrtr.c | ||
| @@ -1035,8 +1035,12 @@ | ||
| return -EADDRNOTAVAIL; | ||
| } | ||
|
|
||
| +#if LINUX_VERSION_CODE < KERNEL_VERSION(6,1,0) | ||
| skb = skb_recv_datagram(sk, flags & ~MSG_DONTWAIT, | ||
| flags & MSG_DONTWAIT, &rc); | ||
| +#else | ||
| + skb = skb_recv_datagram(sk, flags, &rc); | ||
| +#endif | ||
| if (!skb) { | ||
| release_sock(sk); | ||
| return rc; |
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
32 changes: 32 additions & 0 deletions
32
package/network/services/dnsmasq/files/50-dnsmasq-migrate-ipset.sh
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 |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| #!/bin/sh | ||
|
|
||
| ipsets=$(uci -q get dhcp.@dnsmasq[0].ipset) | ||
| [ -z "$ipsets" ] && exit 0 | ||
|
|
||
| for ipset in $ipsets; do | ||
| names=${ipset##*/} | ||
| domains=${ipset%/*} | ||
|
|
||
| [ -z "$names" ] || [ -z "$domains" ] && continue | ||
|
|
||
| uci add dhcp ipset | ||
|
|
||
| OLDIFS="$IFS" | ||
|
|
||
| IFS="," | ||
| for name in $names; do | ||
| uci add_list dhcp.@ipset[-1].name="$name" | ||
| done | ||
|
|
||
| IFS="/" | ||
| for domain in ${domains:1}; do | ||
| uci add_list dhcp.@ipset[-1].domain="$domain" | ||
| done | ||
|
|
||
| IFS="$OLDIFS" | ||
|
|
||
| uci del_list dhcp.@dnsmasq[0].ipset="$ipset" | ||
| done | ||
|
|
||
| uci commit dhcp | ||
| exit 0 |
Oops, something went wrong.