developer | 5cebe56 | 2022-10-08 00:32:24 +0800 | [diff] [blame^] | 1 | From 0905060a7bfced9c8cad91a223991a7fa24c3d12 Mon Sep 17 00:00:00 2001 |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 2 | From: StanleyYP Wang <StanleyYP.Wang@mediatek.com> |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 3 | Date: Fri, 7 Oct 2022 10:46:29 +0800 |
developer | 5cebe56 | 2022-10-08 00:32:24 +0800 | [diff] [blame^] | 4 | Subject: [PATCH 99919/99920] Add DFS disable channel switch when receive radar |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 5 | |
| 6 | Signed-off-by: StanleyYP Wang <StanleyYP.Wang@mediatek.com> |
| 7 | --- |
| 8 | hostapd/config_file.c | 4 ++++ |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 9 | hostapd/ctrl_iface.c | 20 ++++++++++++++++++++ |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 10 | src/ap/ap_config.h | 13 +++++++++++++ |
| 11 | src/ap/dfs.c | 10 ++++++++++ |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 12 | 4 files changed, 47 insertions(+) |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 13 | |
| 14 | diff --git a/hostapd/config_file.c b/hostapd/config_file.c |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 15 | index 310f97d..a2ee418 100644 |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 16 | --- a/hostapd/config_file.c |
| 17 | +++ b/hostapd/config_file.c |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 18 | @@ -4807,6 +4807,10 @@ static int hostapd_config_fill(struct hostapd_config *conf, |
| 19 | return 1; |
| 20 | } |
| 21 | conf->amsdu = val; |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 22 | + } else if (os_strcmp(buf, "dfs_detect_mode") == 0) { /*bypass channel switch*/ |
| 23 | + u8 en = strtol(pos, NULL, 10); |
| 24 | + |
| 25 | + conf->dfs_detect_mode = en; |
| 26 | } else { |
| 27 | wpa_printf(MSG_ERROR, |
| 28 | "Line %d: unknown configuration item '%s'", |
| 29 | diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 30 | index 0c40175..cc440fd 100644 |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 31 | --- a/hostapd/ctrl_iface.c |
| 32 | +++ b/hostapd/ctrl_iface.c |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 33 | @@ -3537,6 +3537,26 @@ hostapd_ctrl_iface_get_aggregation(struct hostapd_data *hapd, char *buf, |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 34 | } |
| 35 | |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 36 | |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 37 | +static int |
| 38 | +hostapd_ctrl_iface_set_dfs_detect_mode(struct hostapd_data *hapd, char *value, |
| 39 | + char *buf, size_t buflen) |
| 40 | +{ |
| 41 | + u8 dfs_detect_mode; |
| 42 | + |
| 43 | + if (!value) |
| 44 | + return -1; |
| 45 | + |
| 46 | + dfs_detect_mode = strtol(value, NULL, 10); |
| 47 | + if (dfs_detect_mode > DFS_DETECT_MODE_MAX) { |
| 48 | + wpa_printf(MSG_ERROR, "Invalid value for dfs detect mode"); |
| 49 | + return -1; |
| 50 | + } |
| 51 | + hapd->iconf->dfs_detect_mode = dfs_detect_mode; |
| 52 | + |
| 53 | + return 0; |
| 54 | +} |
| 55 | + |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 56 | + |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 57 | static int hostapd_ctrl_iface_receive_process(struct hostapd_data *hapd, |
| 58 | char *buf, char *reply, |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 59 | int reply_size, |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 60 | diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 61 | index 01b051d..f567c37 100644 |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 62 | --- a/src/ap/ap_config.h |
| 63 | +++ b/src/ap/ap_config.h |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 64 | @@ -1160,6 +1160,7 @@ struct hostapd_config { |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 65 | u8 ibf_enable; |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 66 | u8 ampdu; |
| 67 | u8 amsdu; |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 68 | + u8 dfs_detect_mode; |
| 69 | }; |
| 70 | |
| 71 | enum three_wire_mode { |
developer | 9f76497 | 2022-10-06 18:59:51 +0800 | [diff] [blame] | 72 | @@ -1174,6 +1175,18 @@ enum three_wire_mode { |
developer | a13d7b4 | 2022-09-23 12:17:51 +0800 | [diff] [blame] | 73 | NUM_THREE_WIRE_MODE - 1 |
| 74 | }; |
| 75 | |
| 76 | +enum dfs_mode { |
| 77 | + DFS_DETECT_MODE_DISABLE, |
| 78 | + DFS_DETECT_MODE_AP_ENABLE, |
| 79 | + DFS_DETECT_MODE_BACKGROUND_ENABLE, |
| 80 | + DFS_DETECT_MODE_ALL_ENABLE, |
| 81 | + |
| 82 | + /* keep last */ |
| 83 | + NUM_DFS_DETECT_MODE, |
| 84 | + DFS_DETECT_MODE_MAX = |
| 85 | + NUM_DFS_DETECT_MODE - 1 |
| 86 | +}; |
| 87 | + |
| 88 | enum edcca_mode { |
| 89 | EDCCA_MODE_FORCE_DISABLE = 0, |
| 90 | EDCCA_MODE_AUTO = 1, |
| 91 | diff --git a/src/ap/dfs.c b/src/ap/dfs.c |
| 92 | index b5d105d..5cb7799 100644 |
| 93 | --- a/src/ap/dfs.c |
| 94 | +++ b/src/ap/dfs.c |
| 95 | @@ -1317,6 +1317,11 @@ hostapd_dfs_background_start_channel_switch(struct hostapd_iface *iface, |
| 96 | __func__, iface->radar_background.cac_started ? "yes" : "no", |
| 97 | hostapd_csa_in_progress(iface) ? "yes" : "no"); |
| 98 | |
| 99 | + /* Skip channel switch when background dfs detect mode is on */ |
| 100 | + if (iface->conf->dfs_detect_mode == DFS_DETECT_MODE_BACKGROUND_ENABLE || |
| 101 | + iface->conf->dfs_detect_mode == DFS_DETECT_MODE_ALL_ENABLE) |
| 102 | + return 0; |
| 103 | + |
| 104 | /* Check if CSA in progress */ |
| 105 | if (hostapd_csa_in_progress(iface)) |
| 106 | return 0; |
| 107 | @@ -1365,6 +1370,11 @@ static int hostapd_dfs_start_channel_switch(struct hostapd_iface *iface) |
| 108 | __func__, iface->cac_started ? "yes" : "no", |
| 109 | hostapd_csa_in_progress(iface) ? "yes" : "no"); |
| 110 | |
| 111 | + /* Skip channel switch when dfs detect mode is on */ |
| 112 | + if (iface->conf->dfs_detect_mode == DFS_DETECT_MODE_AP_ENABLE || |
| 113 | + iface->conf->dfs_detect_mode == DFS_DETECT_MODE_ALL_ENABLE) |
| 114 | + return 0; |
| 115 | + |
| 116 | /* Check if CSA in progress */ |
| 117 | if (hostapd_csa_in_progress(iface)) |
| 118 | return 0; |
| 119 | -- |
| 120 | 2.18.0 |
| 121 | |