hostapd: Remove unneeded patch
All the content of this function is proceeded by IEEE8021X_EAPOL no code accesses the ssid variable outside of this ifdef. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
		| @@ -1,14 +0,0 @@ | |||||||
| --- a/wpa_supplicant/wpa_supplicant.c |  | ||||||
| +++ b/wpa_supplicant/wpa_supplicant.c |  | ||||||
| @@ -297,9 +297,10 @@ void wpa_supplicant_cancel_auth_timeout( |  | ||||||
|   */ |  | ||||||
|  void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s) |  | ||||||
|  { |  | ||||||
| +	struct wpa_ssid *ssid = wpa_s->current_ssid; |  | ||||||
| + |  | ||||||
|  #ifdef IEEE8021X_EAPOL |  | ||||||
|  	struct eapol_config eapol_conf; |  | ||||||
| -	struct wpa_ssid *ssid = wpa_s->current_ssid; |  | ||||||
|   |  | ||||||
|  #ifdef CONFIG_IBSS_RSN |  | ||||||
|  	if (ssid->mode == WPAS_MODE_IBSS && |  | ||||||
| @@ -253,7 +253,7 @@ | |||||||
|  	struct wpa_supplicant *wpa_s; |  	struct wpa_supplicant *wpa_s; | ||||||
| --- a/wpa_supplicant/wpa_supplicant.c | --- a/wpa_supplicant/wpa_supplicant.c | ||||||
| +++ b/wpa_supplicant/wpa_supplicant.c | +++ b/wpa_supplicant/wpa_supplicant.c | ||||||
| @@ -6097,7 +6097,6 @@ struct wpa_interface * wpa_supplicant_ma | @@ -6096,7 +6096,6 @@ struct wpa_interface * wpa_supplicant_ma | ||||||
|  	return NULL; |  	return NULL; | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -261,7 +261,7 @@ | |||||||
|  /** |  /** | ||||||
|   * wpa_supplicant_match_existing - Match existing interfaces |   * wpa_supplicant_match_existing - Match existing interfaces | ||||||
|   * @global: Pointer to global data from wpa_supplicant_init() |   * @global: Pointer to global data from wpa_supplicant_init() | ||||||
| @@ -6134,6 +6133,11 @@ static int wpa_supplicant_match_existing | @@ -6133,6 +6132,11 @@ static int wpa_supplicant_match_existing | ||||||
|   |   | ||||||
|  #endif /* CONFIG_MATCH_IFACE */ |  #endif /* CONFIG_MATCH_IFACE */ | ||||||
|   |   | ||||||
| @@ -273,7 +273,7 @@ | |||||||
|   |   | ||||||
|  /** |  /** | ||||||
|   * wpa_supplicant_add_iface - Add a new network interface |   * wpa_supplicant_add_iface - Add a new network interface | ||||||
| @@ -6390,6 +6394,8 @@ struct wpa_global * wpa_supplicant_init( | @@ -6389,6 +6393,8 @@ struct wpa_global * wpa_supplicant_init( | ||||||
|  #ifndef CONFIG_NO_WPA_MSG |  #ifndef CONFIG_NO_WPA_MSG | ||||||
|  	wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); |  	wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb); | ||||||
|  #endif /* CONFIG_NO_WPA_MSG */ |  #endif /* CONFIG_NO_WPA_MSG */ | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ | |||||||
|  	if (conf->hw_mode == HOSTAPD_MODE_IEEE80211A && ssid->vht) { |  	if (conf->hw_mode == HOSTAPD_MODE_IEEE80211A && ssid->vht) { | ||||||
| --- a/wpa_supplicant/wpa_supplicant.c | --- a/wpa_supplicant/wpa_supplicant.c | ||||||
| +++ b/wpa_supplicant/wpa_supplicant.c | +++ b/wpa_supplicant/wpa_supplicant.c | ||||||
| @@ -2144,12 +2144,12 @@ void ibss_mesh_setup_freq(struct wpa_sup | @@ -2143,12 +2143,12 @@ void ibss_mesh_setup_freq(struct wpa_sup | ||||||
|  	int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode); |  	int ieee80211_mode = wpas_mode_to_ieee80211_mode(ssid->mode); | ||||||
|  	enum hostapd_hw_mode hw_mode; |  	enum hostapd_hw_mode hw_mode; | ||||||
|  	struct hostapd_hw_modes *mode = NULL; |  	struct hostapd_hw_modes *mode = NULL; | ||||||
| @@ -46,7 +46,7 @@ | |||||||
|  	unsigned int j, k; |  	unsigned int j, k; | ||||||
|  	struct hostapd_freq_params vht_freq; |  	struct hostapd_freq_params vht_freq; | ||||||
|  	int chwidth, seg0, seg1; |  	int chwidth, seg0, seg1; | ||||||
| @@ -2222,7 +2222,7 @@ void ibss_mesh_setup_freq(struct wpa_sup | @@ -2221,7 +2221,7 @@ void ibss_mesh_setup_freq(struct wpa_sup | ||||||
|  		return; |  		return; | ||||||
|   |   | ||||||
|  	/* Setup higher BW only for 5 GHz */ |  	/* Setup higher BW only for 5 GHz */ | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/wpa_supplicant/wpa_supplicant.c | --- a/wpa_supplicant/wpa_supplicant.c | ||||||
| +++ b/wpa_supplicant/wpa_supplicant.c | +++ b/wpa_supplicant/wpa_supplicant.c | ||||||
| @@ -4475,7 +4475,7 @@ wpa_supplicant_alloc(struct wpa_supplica | @@ -4474,7 +4474,7 @@ wpa_supplicant_alloc(struct wpa_supplica | ||||||
|  	if (wpa_s == NULL) |  	if (wpa_s == NULL) | ||||||
|  		return NULL; |  		return NULL; | ||||||
|  	wpa_s->scan_req = INITIAL_SCAN_REQ; |  	wpa_s->scan_req = INITIAL_SCAN_REQ; | ||||||
|   | |||||||
| @@ -166,7 +166,7 @@ | |||||||
|  /* Configure default/group WEP keys for static WEP */ |  /* Configure default/group WEP keys for static WEP */ | ||||||
|  int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) |  int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid) | ||||||
|  { |  { | ||||||
| @@ -941,12 +990,16 @@ void wpa_supplicant_set_state(struct wpa | @@ -940,12 +989,16 @@ void wpa_supplicant_set_state(struct wpa | ||||||
|   |   | ||||||
|  		sme_sched_obss_scan(wpa_s, 1); |  		sme_sched_obss_scan(wpa_s, 1); | ||||||
|   |   | ||||||
| @@ -183,7 +183,7 @@ | |||||||
|  		wpa_s->new_connection = 1; |  		wpa_s->new_connection = 1; | ||||||
|  		wpa_drv_set_operstate(wpa_s, 0); |  		wpa_drv_set_operstate(wpa_s, 0); | ||||||
|  #ifndef IEEE8021X_EAPOL |  #ifndef IEEE8021X_EAPOL | ||||||
| @@ -2039,6 +2092,8 @@ void wpa_supplicant_associate(struct wpa | @@ -2038,6 +2091,8 @@ void wpa_supplicant_associate(struct wpa | ||||||
|  			wpa_ssid_txt(ssid->ssid, ssid->ssid_len), |  			wpa_ssid_txt(ssid->ssid, ssid->ssid_len), | ||||||
|  			ssid->id); |  			ssid->id); | ||||||
|  		wpas_notify_mesh_group_started(wpa_s, ssid); |  		wpas_notify_mesh_group_started(wpa_s, ssid); | ||||||
| @@ -192,7 +192,7 @@ | |||||||
|  #else /* CONFIG_MESH */ |  #else /* CONFIG_MESH */ | ||||||
|  		wpa_msg(wpa_s, MSG_ERROR, |  		wpa_msg(wpa_s, MSG_ERROR, | ||||||
|  			"mesh mode support not included in the build"); |  			"mesh mode support not included in the build"); | ||||||
| @@ -5717,6 +5772,16 @@ static int wpa_supplicant_init_iface(str | @@ -5716,6 +5771,16 @@ static int wpa_supplicant_init_iface(str | ||||||
|  			   sizeof(wpa_s->bridge_ifname)); |  			   sizeof(wpa_s->bridge_ifname)); | ||||||
|  	} |  	} | ||||||
|   |   | ||||||
| @@ -209,7 +209,7 @@ | |||||||
|  	/* RSNA Supplicant Key Management - INITIALIZE */ |  	/* RSNA Supplicant Key Management - INITIALIZE */ | ||||||
|  	eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE); |  	eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE); | ||||||
|  	eapol_sm_notify_portValid(wpa_s->eapol, FALSE); |  	eapol_sm_notify_portValid(wpa_s->eapol, FALSE); | ||||||
| @@ -6044,6 +6109,11 @@ static void wpa_supplicant_deinit_iface( | @@ -6043,6 +6108,11 @@ static void wpa_supplicant_deinit_iface( | ||||||
|  	if (terminate) |  	if (terminate) | ||||||
|  		wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING); |  		wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -174,7 +174,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org> | |||||||
|  	 * macsec_policy - Determines the policy for MACsec secure session |  	 * macsec_policy - Determines the policy for MACsec secure session | ||||||
| --- a/wpa_supplicant/wpa_supplicant.c | --- a/wpa_supplicant/wpa_supplicant.c | ||||||
| +++ b/wpa_supplicant/wpa_supplicant.c | +++ b/wpa_supplicant/wpa_supplicant.c | ||||||
| @@ -3267,6 +3267,12 @@ static void wpas_start_assoc_cb(struct w | @@ -3266,6 +3266,12 @@ static void wpas_start_assoc_cb(struct w | ||||||
|  			params.beacon_int = ssid->beacon_int; |  			params.beacon_int = ssid->beacon_int; | ||||||
|  		else |  		else | ||||||
|  			params.beacon_int = wpa_s->conf->beacon_int; |  			params.beacon_int = wpa_s->conf->beacon_int; | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/wpa_supplicant/wpa_supplicant.c | --- a/wpa_supplicant/wpa_supplicant.c | ||||||
| +++ b/wpa_supplicant/wpa_supplicant.c | +++ b/wpa_supplicant/wpa_supplicant.c | ||||||
| @@ -2217,11 +2217,13 @@ void ibss_mesh_setup_freq(struct wpa_sup | @@ -2216,11 +2216,13 @@ void ibss_mesh_setup_freq(struct wpa_sup | ||||||
|  	for (j = 0; j < wpa_s->last_scan_res_used; j++) { |  	for (j = 0; j < wpa_s->last_scan_res_used; j++) { | ||||||
|  		struct wpa_bss *bss = wpa_s->last_scan_res[j]; |  		struct wpa_bss *bss = wpa_s->last_scan_res[j]; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -280,7 +280,7 @@ | |||||||
|  CFLAGS += -DCONFIG_WNM_AP |  CFLAGS += -DCONFIG_WNM_AP | ||||||
| --- a/wpa_supplicant/wpa_supplicant.c | --- a/wpa_supplicant/wpa_supplicant.c | ||||||
| +++ b/wpa_supplicant/wpa_supplicant.c | +++ b/wpa_supplicant/wpa_supplicant.c | ||||||
| @@ -6298,6 +6298,8 @@ struct wpa_supplicant * wpa_supplicant_a | @@ -6297,6 +6297,8 @@ struct wpa_supplicant * wpa_supplicant_a | ||||||
|  	} |  	} | ||||||
|  #endif /* CONFIG_P2P */ |  #endif /* CONFIG_P2P */ | ||||||
|   |   | ||||||
| @@ -289,7 +289,7 @@ | |||||||
|  	return wpa_s; |  	return wpa_s; | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -6324,6 +6326,8 @@ int wpa_supplicant_remove_iface(struct w | @@ -6323,6 +6325,8 @@ int wpa_supplicant_remove_iface(struct w | ||||||
|  	struct wpa_supplicant *parent = wpa_s->parent; |  	struct wpa_supplicant *parent = wpa_s->parent; | ||||||
|  #endif /* CONFIG_MESH */ |  #endif /* CONFIG_MESH */ | ||||||
|   |   | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Hauke Mehrtens
					Hauke Mehrtens