Merge pull request #4 from p-web-git/v2.11-patch-changes

V2.11 patch changes

Author: p-web-git

For_intel_Wi-Fi_cards_v2_10.patch

@@ -1,11 +1,5 @@
 Subject: [PATCH] For intel Wi-Fi cards, force to scan other wireless networks so the drive is able to set the correct region - hostap v2.10
 
-Signed-off-by: ------------- <[email protected]>
----
-Index: src/ap/hostapd.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
 ===================================================================
 diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
 --- a/src/ap/hostapd.h	(revision cff80b4f7d3c0a47c052e8187d671710f48939e4)

For_intel_Wi-Fi_cards_v2_11.patch

@@ -1,32 +1,62 @@
 Subject: [PATCH] For intel Wi-Fi cards, force to scan other wireless networks so the drive is able to set the correct region - hostap v2.11
 
-Signed-off-by: ------------- <[email protected]>
----
-Index: src/ap/hostapd.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
 ===================================================================
+diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
+index a05de030d..3cf01a296 100644
+--- a/src/ap/hostapd.c
++++ b/src/ap/hostapd.c
+@@ -1985,18 +1985,15 @@ static void channel_list_update_timeout(void *eloop_ctx, void *timeout_ctx)
+ 
+ 
+ void hostapd_channel_list_updated(struct hostapd_iface *iface, int initiator)
+-{
+-	if (initiator == REGDOM_SET_BY_DRIVER) {
+-		hostapd_for_each_interface(iface->interfaces,
+-					   hostapd_no_ir_channel_list_updated,
+-					   NULL);
+-		return;
+-	}
++{}
+ 
+-	if (!iface->wait_channel_update || initiator != REGDOM_SET_BY_USER)
++
++void hostapd_scan_results_updated(struct hostapd_iface *iface)
++{
++	if (!iface->wait_channel_update)
+ 		return;
+ 
+-	wpa_printf(MSG_DEBUG, "Channel list updated - continue setup");
++	wpa_printf(MSG_DEBUG, "Scan results updated - continue setup");
+ 	eloop_cancel_timeout(channel_list_update_timeout, iface, NULL);
+ 	setup_interface2(iface);
+ }
+@@ -2064,7 +2061,8 @@ static int setup_interface(struct hostapd_iface *iface)
+ 		if (os_strncmp(previous_country, country, 2) != 0) {
+ 			wpa_printf(MSG_DEBUG, "Continue interface setup after channel list update");
+ 			iface->wait_channel_update = 1;
+-			eloop_register_timeout(5, 0,
++			int timeout = hostapd_scan_region_before_setting_channel(iface, NULL) ? 10 : 5;
++			eloop_register_timeout(timeout, 0,
+ 					       channel_list_update_timeout,
+ 					       iface, NULL);
+ 			return 0;
 diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
---- a/src/ap/hostapd.h	(revision d945ddd368085f255e68328f2d3b020ceea359af)
-+++ b/src/ap/hostapd.h	(date 1735583802487)
-@@ -746,6 +746,7 @@
+index dcf395ca5..adb0a5b38 100644
+--- a/src/ap/hostapd.h
++++ b/src/ap/hostapd.h
+@@ -746,6 +746,7 @@ void hostapd_cleanup_iface_partial(struct hostapd_iface *iface);
  int hostapd_add_iface(struct hapd_interfaces *ifaces, char *buf);
  int hostapd_remove_iface(struct hapd_interfaces *ifaces, char *buf);
  void hostapd_channel_list_updated(struct hostapd_iface *iface, int initiator);
 +void hostapd_scan_results_updated(struct hostapd_iface *iface);
  void hostapd_set_state(struct hostapd_iface *iface, enum hostapd_iface_state s);
  const char * hostapd_state_text(enum hostapd_iface_state s);
  int hostapd_csa_in_progress(struct hostapd_iface *iface);
-Index: src/ap/hw_features.c
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
 diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
---- a/src/ap/hw_features.c	(revision d945ddd368085f255e68328f2d3b020ceea359af)
-+++ b/src/ap/hw_features.c	(date 1735583802511)
-@@ -42,6 +42,14 @@
+index c4556603d..639ce4088 100644
+--- a/src/ap/hw_features.c
++++ b/src/ap/hw_features.c
+@@ -42,6 +42,14 @@ void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features,
  }
 
 
@@ -41,7 +71,7 @@ diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
  #ifndef CONFIG_NO_STDOUT_DEBUG
  static char * dfs_info(struct hostapd_channel_data *chan)
  {
-@@ -85,6 +93,10 @@
+@@ -85,6 +93,10 @@ int hostapd_get_hw_features(struct hostapd_iface *iface)
 
  	if (hostapd_drv_none(hapd))
  		return -1;
@@ -52,7 +82,7 @@ diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
  	modes = hostapd_get_hw_feature_data(hapd, &num_modes, &flags,
  					    &dfs_domain);
  	if (modes == NULL) {
-@@ -539,6 +551,34 @@
+@@ -539,6 +551,34 @@ static void ap_ht40_scan_retry(void *eloop_data, void *user_data)
  }
 
 
@@ -87,59 +117,11 @@ diff --git a/src/ap/hw_features.c b/src/ap/hw_features.c
  void hostapd_stop_setup_timers(struct hostapd_iface *iface)
  {
  	eloop_cancel_timeout(ap_ht40_scan_retry, iface, NULL);
-Index: src/ap/hostapd.c
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
-diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
---- a/src/ap/hostapd.c	(revision d945ddd368085f255e68328f2d3b020ceea359af)
-+++ b/src/ap/hostapd.c	(date 1735583802473)
-@@ -1983,8 +1983,11 @@
- 	setup_interface2(iface);
- }
- 
--
- void hostapd_channel_list_updated(struct hostapd_iface *iface, int initiator)
-+{}
-+
-+
-+void hostapd_scan_results_updated(struct hostapd_iface *iface)
- {
- 	if (initiator == REGDOM_SET_BY_DRIVER) {
- 		hostapd_for_each_interface(iface->interfaces,
-@@ -1993,10 +1996,10 @@
- 		return;
- 	}
- 
--	if (!iface->wait_channel_update || initiator != REGDOM_SET_BY_USER)
-+	if (!iface->wait_channel_update)
- 		return;
- 
--	wpa_printf(MSG_DEBUG, "Channel list updated - continue setup");
-+	wpa_printf(MSG_DEBUG, "Scan results updated - continue setup");
- 	eloop_cancel_timeout(channel_list_update_timeout, iface, NULL);
- 	setup_interface2(iface);
- }
-@@ -2064,7 +2067,8 @@
- 		if (os_strncmp(previous_country, country, 2) != 0) {
- 			wpa_printf(MSG_DEBUG, "Continue interface setup after channel list update");
- 			iface->wait_channel_update = 1;
--			eloop_register_timeout(5, 0,
-+			int timeout = hostapd_scan_region_before_setting_channel(iface, NULL) ? 10 : 5;
-+			eloop_register_timeout(timeout, 0,
- 					       channel_list_update_timeout,
- 					       iface, NULL);
- 			return 0;
-Index: src/ap/hw_features.h
-IDEA additional info:
-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
-<+>UTF-8
-===================================================================
 diff --git a/src/ap/hw_features.h b/src/ap/hw_features.h
---- a/src/ap/hw_features.h	(revision d945ddd368085f255e68328f2d3b020ceea359af)
-+++ b/src/ap/hw_features.h	(date 1735583802520)
-@@ -21,6 +21,7 @@
+index c682c6d20..ad4b6cf7d 100644
+--- a/src/ap/hw_features.h
++++ b/src/ap/hw_features.h
+@@ -21,6 +21,7 @@ int hostapd_select_hw_mode(struct hostapd_iface *iface);
  const char * hostapd_hw_mode_txt(int mode);
  int hostapd_hw_get_freq(struct hostapd_data *hapd, int chan);
  int hostapd_hw_get_channel(struct hostapd_data *hapd, int freq);