Startsida Utforska Hjälp
Registrera dig Logga in
OpenWrt
/
openwrt
spegling av https://github.com/openwrt/openwrt.git
2
0
Fork 0
Filer Ärenden 0 Wiki
Träd: 2e0f41e73a
Grenar Taggar
openwrt
/
package
/
network
/
services
/
hostapd
/
patches
/
301-mesh-noscan.patch

301-mesh-noscan.patch 2.1 KB
Historik Rå

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768 
  1. --- a/wpa_supplicant/config.c
    2. 

  2. +++ b/wpa_supplicant/config.c
    3. 

  3. @@ -2233,6 +2233,7 @@ static const struct parse_data ssid_fiel
    4. 

  4.  #else /* CONFIG_MESH */
    5. 

  5.  	{ INT_RANGE(mode, 0, 4) },
    6. 

  6.  #endif /* CONFIG_MESH */
    7. 

  7. +	{ INT_RANGE(noscan, 0, 1) },
    8. 

  8.  	{ INT_RANGE(proactive_key_caching, 0, 1) },
    9. 

  9.  	{ INT_RANGE(disabled, 0, 2) },
    10. 

  10.  	{ STR(id_str) },
    11. 

  11. --- a/wpa_supplicant/config_file.c
    12. 

  12. +++ b/wpa_supplicant/config_file.c
    13. 

  13. @@ -818,6 +818,7 @@ static void wpa_config_write_network(FIL
    14. 

  14.  #endif /* IEEE8021X_EAPOL */
    15. 

  15.  	INT(mode);
    16. 

  16.  	INT(no_auto_peer);
    17. 

  17. +	INT(noscan);
    18. 

  18.  	INT(mesh_fwding);
    19. 

  19.  	INT(frequency);
    20. 

  20.  	INT(fixed_freq);
    21. 

  21. --- a/wpa_supplicant/mesh.c
    22. 

  22. +++ b/wpa_supplicant/mesh.c
    23. 

  23. @@ -288,6 +288,8 @@ static int wpa_supplicant_mesh_init(stru
    24. 

  24.  			   frequency);
    25. 

  25.  		goto out_free;
    26. 

  26.  	}
    27. 

  27. +	if (ssid->noscan)
    28. 

  28. +		conf->noscan = 1;
    29. 

  29.  	if (ssid->ht40)
    30. 

  30.  		conf->secondary_channel = ssid->ht40;
    31. 

  31.  	if (conf->hw_mode == HOSTAPD_MODE_IEEE80211A && ssid->vht) {
    32. 

  32. --- a/wpa_supplicant/wpa_supplicant.c
    33. 

  33. +++ b/wpa_supplicant/wpa_supplicant.c
    34. 

  34. @@ -2081,12 +2081,12 @@ void ibss_mesh_setup_freq(struct wpa_sup
    35. 

  35.  {
    36. 

  36.  	enum hostapd_hw_mode hw_mode;
    37. 

  37.  	struct hostapd_hw_modes *mode = NULL;
    38. 

  38. -	int ht40plus[] = { 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157,
    39. 

  39. +	int ht40plus[] = { 1, 2, 3, 4, 5, 6, 36, 44, 52, 60, 100, 108, 116, 124, 132, 149, 157,
    40. 

  40.  			   184, 192 };
    41. 

  41.  	int vht80[] = { 36, 52, 100, 116, 132, 149 };
    42. 

  42.  	struct hostapd_channel_data *pri_chan = NULL, *sec_chan = NULL;
    43. 

  43.  	u8 channel;
    44. 

  44. -	int i, chan_idx, ht40 = -1, res, obss_scan = 1;
    45. 

  45. +	int i, chan_idx, ht40 = -1, res, obss_scan = !(ssid->noscan);
    46. 

  46.  	unsigned int j, k;
    47. 

  47.  	struct hostapd_freq_params vht_freq;
    48. 

  48.  	int chwidth, seg0, seg1;
    49. 

  49. @@ -2156,7 +2156,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
    50. 

  50.  		return;
    51. 

  51.  
    52. 

  52.  	/* Setup higher BW only for 5 GHz */
    53. 

  53. -	if (mode->mode != HOSTAPD_MODE_IEEE80211A)
    54. 

  54. +	if (mode->mode != HOSTAPD_MODE_IEEE80211A && !(ssid->noscan))
    55. 

  55.  		return;
    56. 

  56.  
    57. 

  57.  	for (chan_idx = 0; chan_idx < mode->num_channels; chan_idx++) {
    58. 

  58. --- a/wpa_supplicant/config_ssid.h
    59. 

  59. +++ b/wpa_supplicant/config_ssid.h
    60. 

  60. @@ -856,6 +856,8 @@ struct wpa_ssid {
    61. 

  61.  	 */
    62. 

  62.  	int no_auto_peer;
    63. 

  63.  
    64. 

  64. +	int noscan;
    65. 

  65. +
    66. 

  66.  	/**
    67. 

  67.  	 * mesh_rssi_threshold - Set mesh parameter mesh_rssi_threshold (dBm)
    68. 

  68.  	 *
    69.