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: bump 5.19 to 5.19.3 (coolsnowwolf#9983) hostapd: make LAR-friendly AP mode for AX200/AX210 cleanup: Remove upstreamed patch (coolsnowwolf#9982)
- Loading branch information
Showing
6 changed files
with
136 additions
and
110 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-5.19 = .2 | ||
| LINUX_KERNEL_HASH-5.19.2 = 48e40a1f5501ec6c40e3c86d3d5319200b688f2d9360f72833084d74801fe63d | ||
| LINUX_VERSION-5.19 = .3 | ||
| LINUX_KERNEL_HASH-5.19.3 = 513bd672066f5fb22e5739aae3eed60c75c4accc9ba365d1060c4e4225442721 |
86 changes: 86 additions & 0 deletions
86
package/network/services/hostapd/patches/800-hostapd-2.10-lar.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,86 @@ | ||
| diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c | ||
| --- a/src/ap/hw_features.c 2022-01-16 15:51:29.000000000 -0500 | ||
| +++ b/src/ap/hw_features.c 2022-07-06 22:57:53.007315518 -0500 | ||
| @@ -26,6 +26,17 @@ | ||
| #include "beacon.h" | ||
| #include "hw_features.h" | ||
|
|
||
| +static void ieee80211n_do_nothing(struct hostapd_iface *iface) | ||
| +{ | ||
| + wpa_printf(MSG_DEBUG, | ||
| + "Scan finished!"); | ||
| +} | ||
| + | ||
| +static void ieee80211n_scan_channels_2g4(struct hostapd_iface *iface, | ||
| + struct wpa_driver_scan_params *params); | ||
| +static void ieee80211n_scan_channels_5g(struct hostapd_iface *iface, | ||
| + struct wpa_driver_scan_params *params); | ||
| + | ||
|
|
||
| void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features, | ||
| size_t num_hw_features) | ||
| @@ -82,6 +93,33 @@ | ||
|
|
||
| if (hostapd_drv_none(hapd)) | ||
| return -1; | ||
| + | ||
| + | ||
| + if (!iface->conf->noscan) { | ||
| + // scan | ||
| + struct wpa_driver_scan_params params; | ||
| + int ret1; | ||
| + | ||
| + os_memset(¶ms, 0, sizeof(params)); | ||
| + ieee80211n_scan_channels_5g(iface, ¶ms); | ||
| + | ||
| + ret1 = hostapd_driver_scan(iface->bss[0], ¶ms); | ||
| + | ||
| + if (ret1 == -EBUSY) { | ||
| + wpa_printf(MSG_ERROR, | ||
| + "Failed to request a scan of neighboring BSSes ret=%d (%s)!", | ||
| + ret1, strerror(-ret1)); | ||
| + } | ||
| + | ||
| + if (ret1 == 0) { | ||
| + iface->scan_cb = ieee80211n_do_nothing; | ||
| + wpa_printf(MSG_DEBUG, | ||
| + "Sleeping..."); | ||
| + for (int i=0; i<110; i++) { | ||
| + usleep(100000); | ||
| + } | ||
| + } | ||
| + } | ||
| modes = hostapd_get_hw_feature_data(hapd, &num_modes, &flags, | ||
| &dfs_domain); | ||
| if (modes == NULL) { | ||
|
|
||
| @@ -308,7 +346,6 @@ | ||
| sec_chan); | ||
| } | ||
|
|
||
| - | ||
| static void ieee80211n_check_scan(struct hostapd_iface *iface) | ||
| { | ||
| struct wpa_scan_results *scan_res; | ||
| @@ -517,8 +554,10 @@ | ||
| int ret; | ||
|
|
||
| /* Check that HT40 is used and PRI / SEC switch is allowed */ | ||
| - if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch) | ||
| + if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch || iface->conf->noscan) { | ||
| + wpa_printf(MSG_DEBUG, "Not scanning due to noscan?"); | ||
| return 0; | ||
| + } | ||
|
|
||
| hostapd_set_state(iface, HAPD_IFACE_HT_SCAN); | ||
| wpa_printf(MSG_DEBUG, "Scan for neighboring BSSes prior to enabling " | ||
| @@ -916,7 +954,7 @@ | ||
| if (!hostapd_is_usable_edmg(iface)) | ||
| return 0; | ||
|
|
||
| - if (!iface->conf->secondary_channel) | ||
| + if (!iface->conf->secondary_channel || iface->conf->noscan) | ||
| return 1; | ||
|
|
||
| if (hostapd_is_usable_chan(iface, iface->freq + | ||
|
|
93 changes: 0 additions & 93 deletions
93
...nux/rockchip/patches-5.19/0011-arm64-dts-rockchip-enable-vop2-and-hdmi-tx-on-rock-3.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
33 changes: 33 additions & 0 deletions
33
...nux/rockchip/patches-5.19/0039-drm-rockchip-vop-Don-t-crash-for-invalid-duplicate_s.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,33 @@ | ||
| From efaa0a55ce429107697f641921336cc51518693a Mon Sep 17 00:00:00 2001 | ||
| From: Brian Norris <briannorris@chromium.org> | ||
| Date: Fri, 17 Jun 2022 17:26:52 -0700 | ||
| Subject: [PATCH 39/51] drm/rockchip: vop: Don't crash for invalid | ||
| duplicate_state() | ||
|
|
||
| It's possible for users to try to duplicate the CRTC state even when the | ||
| state doesn't exist. drm_atomic_helper_crtc_duplicate_state() (and other | ||
| users of __drm_atomic_helper_crtc_duplicate_state()) already guard this | ||
| with a WARN_ON() instead of crashing, so let's do that here too. | ||
|
|
||
| Fixes: 4e257d9eee23 ("drm/rockchip: get rid of rockchip_drm_crtc_mode_config") | ||
| Signed-off-by: Brian Norris <briannorris@chromium.org> | ||
| Reviewed-by: Sean Paul <seanpaul@chromium.org> | ||
| Reviewed-by: Douglas Anderson <dianders@chromium.org> | ||
| Signed-off-by: Heiko Stuebner <heiko@sntech.de> | ||
| Link: https://patchwork.freedesktop.org/patch/msgid/20220617172623.1.I62db228170b1559ada60b8d3e1637e1688424926@changeid | ||
| --- | ||
| drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +++ | ||
| 1 file changed, 3 insertions(+) | ||
|
|
||
| --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c | ||
| +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c | ||
| @@ -1573,6 +1573,9 @@ static struct drm_crtc_state *vop_crtc_d | ||
| if (WARN_ON(!crtc->state)) | ||
| return NULL; | ||
|
|
||
| + if (WARN_ON(!crtc->state)) | ||
| + return NULL; | ||
| + | ||
| rockchip_state = kzalloc(sizeof(*rockchip_state), GFP_KERNEL); | ||
| if (!rockchip_state) | ||
| return NULL; |
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