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.
Browse files
Browse the repository at this point in the history
* https://github.com/coolsnowwolf/lede: README(EN/JA): sync build dependency aic8800: update to version 20240327
- Loading branch information
Showing
10 changed files
with
87 additions
and
75 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
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 |
|---|---|---|
| @@ -1,13 +1,20 @@ | ||
| --- a/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_compat.h | ||
| +++ b/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_compat.h | ||
| @@ -47,8 +47,8 @@ | ||
| #else | ||
| #define HIGH_KERNEL_VERSION KERNEL_VERSION(6, 0, 0) | ||
| #define HIGH_KERNEL_VERSION2 KERNEL_VERSION(6, 1, 0) | ||
| -#define HIGH_KERNEL_VERSION3 KERNEL_VERSION(6, 3, 0) | ||
| -#define HIGH_KERNEL_VERSION4 KERNEL_VERSION(6, 3, 0) | ||
| +#define HIGH_KERNEL_VERSION3 KERNEL_VERSION(6, 9, 0) | ||
| +#define HIGH_KERNEL_VERSION4 KERNEL_VERSION(6, 9, 0) | ||
| #endif | ||
|
|
||
|
|
||
| --- a/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_main.c | ||
| +++ b/src/SDIO/driver_fw/driver/aic8800/aic8800_fdrv/rwnx_main.c | ||
| @@ -781,7 +781,7 @@ static void rwnx_csa_finish(struct work_ | ||
| } else | ||
| rwnx_txq_vif_stop(vif, RWNX_TXQ_STOP_CHAN, rwnx_hw); | ||
| spin_unlock_bh(&rwnx_hw->cb_lock); | ||
| -#if (LINUX_VERSION_CODE >= HIGH_KERNEL_VERSION3) | ||
| +#if (LINUX_VERSION_CODE >= HIGH_KERNEL_VERSION3) && !defined(BUILD_OPENWRT) | ||
| cfg80211_ch_switch_notify(vif->ndev, &csa->chandef, 0, 0); | ||
| #elif (LINUX_VERSION_CODE >= HIGH_KERNEL_VERSION) || defined(BUILD_OPENWRT) | ||
| cfg80211_ch_switch_notify(vif->ndev, &csa->chandef, 0); | ||
| @@ -5561,7 +5561,7 @@ int rwnx_cfg80211_channel_switch (struct | ||
| goto end; | ||
| } else { | ||
| INIT_WORK(&csa->work, rwnx_csa_finish); | ||
| -#if LINUX_VERSION_CODE >= HIGH_KERNEL_VERSION4 | ||
| +#if LINUX_VERSION_CODE >= HIGH_KERNEL_VERSION4 && !defined(BUILD_OPENWRT) | ||
| cfg80211_ch_switch_started_notify(dev, &csa->chandef, 0, params->count, false, 0); | ||
| #elif LINUX_VERSION_CODE >= HIGH_KERNEL_VERSION2 || defined(BUILD_OPENWRT) | ||
| cfg80211_ch_switch_started_notify(dev, &csa->chandef, 0, params->count, false); |
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,20 @@ | ||
| --- a/src/SDIO/driver_fw/driver/aic8800/aic8800_bsp/aic_bsp_driver.c | ||
| +++ b/src/SDIO/driver_fw/driver/aic8800/aic8800_bsp/aic_bsp_driver.c | ||
| @@ -16,6 +16,7 @@ | ||
| #include <linux/delay.h> | ||
| #include <linux/vmalloc.h> | ||
| #include <linux/firmware.h> | ||
| +#include <linux/string.h> | ||
|
|
||
| #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) | ||
| #include <linux/hardirq.h> | ||
| @@ -1364,7 +1365,8 @@ int aicbt_patch_info_unpack(struct aicbt | ||
| patch_info->info_len = head_t->len; | ||
| if(patch_info->info_len == 0) | ||
| return 0; | ||
| - memcpy(&patch_info->adid_addrinf, head_t->data, patch_info->info_len * sizeof(uint32_t) * 2); | ||
| + unsafe_memcpy(&patch_info->adid_addrinf, head_t->data, | ||
| + patch_info->info_len * sizeof(uint32_t) * 2, /* justification */); | ||
| } | ||
| return 0; | ||
| } |