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: mbedtls: update to version 2.28.2 libbsd: fix libpath to not use host path rockchip: fix hinlink_common target fullconenat: Make use of KERNEL_MAKE rockchip: add support for HINLINK OPC-H66K treewide: move some patches into generic 5.15 linux-firmware: disable stripping bcm27xx: fix BCMGENET kernel config linux-firmware: ath11k: add symlink for WCN6855 hw2.1 linux-firmware: update to 20221214 ath10k-ct: add linux kernel v6.1 api update uhttpd: update to latest Git HEAD (coolsnowwolf#10685) mt76: refresh patches (coolsnowwolf#10689) mt76: update to the latest version dnsmasq: bump to v2.88 (coolsnowwolf#10683) Revert "mediatek: add support for Netgear WAX206" ramips: Fix drivers/pwm/pwm-mediatek-ramips.c compile kernel: Move CONFIG_PWM_IMG and CONFIG_PWM_MEDIATEK to generic configuration kernel: Move CONFIG_DRM_XEN_FRONTEND to generic configuration
- Loading branch information
Showing
42 changed files
with
1,087 additions
and
1,553 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
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 |
---|---|---|
@@ -0,0 +1,29 @@ | ||
--- a/ath10k-5.15/core.c | ||
+++ b/ath10k-5.15/core.c | ||
@@ -4151,7 +4151,11 @@ | ||
ath10k_debug_print_board_info(ar); | ||
} | ||
|
||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) | ||
device_get_mac_address(ar->dev, ar->mac_addr, sizeof(ar->mac_addr)); | ||
+#else | ||
+ device_get_mac_address(ar->dev, ar->mac_addr); | ||
+#endif | ||
|
||
/* Try to get mac address from device node (from nvmem cell) */ | ||
of_get_mac_address(ar->dev->of_node, ar->mac_addr); | ||
--- a/ath10k-5.15/pci.c | ||
+++ b/ath10k-5.15/pci.c | ||
@@ -3563,8 +3563,12 @@ | ||
|
||
void ath10k_pci_init_napi(struct ath10k *ar) | ||
{ | ||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0) | ||
netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_pci_napi_poll, | ||
ATH10K_NAPI_BUDGET); | ||
+#else | ||
+ netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_pci_napi_poll); | ||
+#endif | ||
} | ||
|
||
static int ath10k_pci_init_irq(struct ath10k *ar) |
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
Oops, something went wrong.