Skip to content

Commit e38d3c2

Browse files
p-web-gitp-web-git
authored
Update For_intel_Wi-Fi_cards_v2_10.patch
1 parent 1b97b0a commit e38d3c2

File tree

1 file changed

+84
-52
lines changed

1 file changed

+84
-52
lines changed

‎For_intel_Wi-Fi_cards_v2_10.patch‎

Lines changed: 84 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
99
===================================================================
1010
diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
1111
--- a/src/ap/hostapd.h (revision cff80b4f7d3c0a47c052e8187d671710f48939e4)
12-
+++ b/src/ap/hostapd.h (date 1721242433848)
12+
+++ b/src/ap/hostapd.h (date 1735330497792)
1313
@@ -632,6 +632,7 @@
1414
int hostapd_add_iface(struct hapd_interfaces *ifaces, char *buf);
1515
int hostapd_remove_iface(struct hapd_interfaces *ifaces, char *buf);
@@ -18,68 +18,30 @@ diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
1818
void hostapd_set_state(struct hostapd_iface *iface, enum hostapd_iface_state s);
1919
const char * hostapd_state_text(enum hostapd_iface_state s);
2020
int hostapd_csa_in_progress(struct hostapd_iface *iface);
21-
Index: src/ap/hostapd.c
22-
IDEA additional info:
23-
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
24-
<+>UTF-8
25-
===================================================================
26-
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
27-
--- a/src/ap/hostapd.c (revision cff80b4f7d3c0a47c052e8187d671710f48939e4)
28-
+++ b/src/ap/hostapd.c (date 1721242723664)
29-
@@ -1544,13 +1544,16 @@
30-
setup_interface2(iface);
31-
}
32-
33-
-
34-
void hostapd_channel_list_updated(struct hostapd_iface *iface, int initiator)
35-
+{}
36-
+
37-
+
38-
+void hostapd_scan_results_updated(struct hostapd_iface *iface)
39-
{
40-
- if (!iface->wait_channel_update || initiator != REGDOM_SET_BY_USER)
41-
+ if (!iface->wait_channel_update)
42-
return;
43-
44-
- wpa_printf(MSG_DEBUG, "Channel list updated - continue setup");
45-
+ wpa_printf(MSG_DEBUG, "Scan results updated - continue setup");
46-
eloop_cancel_timeout(channel_list_update_timeout, iface, NULL);
47-
setup_interface2(iface);
48-
}
49-
@@ -1618,7 +1621,8 @@
50-
if (os_strncmp(previous_country, country, 2) != 0) {
51-
wpa_printf(MSG_DEBUG, "Continue interface setup after channel list update");
52-
iface->wait_channel_update = 1;
53-
- eloop_register_timeout(5, 0,
54-
+ int timeout = hostapd_scan_region_before_setting_channel(iface, NULL) ? 10 : 5;
55-
+ eloop_register_timeout(timeout, 0,
56-
channel_list_update_timeout,
57-
iface, NULL);
58-
return 0;
59-
Index: src/ap/hw_features.h
21+
Index: src/ap/ap_config.h
6022
IDEA additional info:
6123
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
6224
<+>UTF-8
6325
===================================================================
64-
diff --git a/src/ap/hw_features.h b/src/ap/hw_features.h
65-
--- a/src/ap/hw_features.h (revision cff80b4f7d3c0a47c052e8187d671710f48939e4)
66-
+++ b/src/ap/hw_features.h (date 1721242232169)
67-
@@ -20,6 +20,7 @@
68-
const char * hostapd_hw_mode_txt(int mode);
69-
int hostapd_hw_get_freq(struct hostapd_data *hapd, int chan);
70-
int hostapd_hw_get_channel(struct hostapd_data *hapd, int freq);
71-
+int hostapd_scan_region_before_setting_channel(struct hostapd_iface *iface, void *ctx);
72-
int hostapd_check_ht_capab(struct hostapd_iface *iface);
73-
int hostapd_check_edmg_capab(struct hostapd_iface *iface);
74-
int hostapd_check_he_6ghz_capab(struct hostapd_iface *iface);
26+
diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
27+
--- a/src/ap/ap_config.h (revision cff80b4f7d3c0a47c052e8187d671710f48939e4)
28+
+++ b/src/ap/ap_config.h (date 1735330548763)
29+
@@ -957,6 +957,7 @@
30+
int acs_exclude_dfs;
31+
u8 min_tx_power;
32+
enum hostapd_hw_mode hw_mode; /* HOSTAPD_MODE_IEEE80211A, .. */
33+
+ bool hw_mode_set;
34+
int acs_exclude_6ghz_non_psc;
35+
enum {
36+
LONG_PREAMBLE = 0,
7537
Index: src/ap/hw_features.c
7638
IDEA additional info:
7739
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
7840
<+>UTF-8
7941
===================================================================
8042
diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
8143
--- a/src/ap/hw_features.c (revision cff80b4f7d3c0a47c052e8187d671710f48939e4)
82-
+++ b/src/ap/hw_features.c (date 1721242232153)
44+
+++ b/src/ap/hw_features.c (date 1735330497806)
8345
@@ -42,6 +42,14 @@
8446
}
8547

@@ -141,3 +103,73 @@ diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
141103
void hostapd_stop_setup_timers(struct hostapd_iface *iface)
142104
{
143105
eloop_cancel_timeout(ap_ht40_scan_retry, iface, NULL);
106+
Index: src/ap/hostapd.c
107+
IDEA additional info:
108+
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
109+
<+>UTF-8
110+
===================================================================
111+
diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
112+
--- a/src/ap/hostapd.c (revision cff80b4f7d3c0a47c052e8187d671710f48939e4)
113+
+++ b/src/ap/hostapd.c (date 1735330497782)
114+
@@ -1544,13 +1544,16 @@
115+
setup_interface2(iface);
116+
}
117+
118+
-
119+
void hostapd_channel_list_updated(struct hostapd_iface *iface, int initiator)
120+
+{}
121+
+
122+
+
123+
+void hostapd_scan_results_updated(struct hostapd_iface *iface)
124+
{
125+
- if (!iface->wait_channel_update || initiator != REGDOM_SET_BY_USER)
126+
+ if (!iface->wait_channel_update)
127+
return;
128+
129+
- wpa_printf(MSG_DEBUG, "Channel list updated - continue setup");
130+
+ wpa_printf(MSG_DEBUG, "Scan results updated - continue setup");
131+
eloop_cancel_timeout(channel_list_update_timeout, iface, NULL);
132+
setup_interface2(iface);
133+
}
134+
@@ -1618,7 +1621,8 @@
135+
if (os_strncmp(previous_country, country, 2) != 0) {
136+
wpa_printf(MSG_DEBUG, "Continue interface setup after channel list update");
137+
iface->wait_channel_update = 1;
138+
- eloop_register_timeout(5, 0,
139+
+ int timeout = hostapd_scan_region_before_setting_channel(iface, NULL) ? 10 : 5;
140+
+ eloop_register_timeout(timeout, 0,
141+
channel_list_update_timeout,
142+
iface, NULL);
143+
return 0;
144+
Index: src/ap/hw_features.h
145+
IDEA additional info:
146+
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
147+
<+>UTF-8
148+
===================================================================
149+
diff --git a/src/ap/hw_features.h b/src/ap/hw_features.h
150+
--- a/src/ap/hw_features.h (revision cff80b4f7d3c0a47c052e8187d671710f48939e4)
151+
+++ b/src/ap/hw_features.h (date 1735330497809)
152+
@@ -20,6 +20,7 @@
153+
const char * hostapd_hw_mode_txt(int mode);
154+
int hostapd_hw_get_freq(struct hostapd_data *hapd, int chan);
155+
int hostapd_hw_get_channel(struct hostapd_data *hapd, int freq);
156+
+int hostapd_scan_region_before_setting_channel(struct hostapd_iface *iface, void *ctx);
157+
int hostapd_check_ht_capab(struct hostapd_iface *iface);
158+
int hostapd_check_edmg_capab(struct hostapd_iface *iface);
159+
int hostapd_check_he_6ghz_capab(struct hostapd_iface *iface);
160+
Index: hostapd/config_file.c
161+
IDEA additional info:
162+
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
163+
<+>UTF-8
164+
===================================================================
165+
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
166+
--- a/hostapd/config_file.c (revision cff80b4f7d3c0a47c052e8187d671710f48939e4)
167+
+++ b/hostapd/config_file.c (date 1735330709950)
168+
@@ -3139,6 +3139,7 @@
169+
line, pos);
170+
return 1;
171+
}
172+
+ conf->hw_mode_set = true;
173+
} else if (os_strcmp(buf, "wps_rf_bands") == 0) {
174+
if (os_strcmp(pos, "ad") == 0)
175+
bss->wps_rf_bands = WPS_RF_60GHZ;

0 commit comments

Comments
 (0)