hostapd: refresh patches
Signed-off-by: David Bauer <mail@david-bauer.net>
This commit is contained in:
		| @@ -1,6 +1,6 @@ | |||||||
| --- a/src/drivers/driver_nl80211.c | --- a/src/drivers/driver_nl80211.c | ||||||
| +++ b/src/drivers/driver_nl80211.c | +++ b/src/drivers/driver_nl80211.c | ||||||
| @@ -4973,7 +4973,7 @@ static int nl80211_set_channel(struct i8 | @@ -4970,7 +4970,7 @@ static int nl80211_set_channel(struct i8 | ||||||
|  		   freq->freq, freq->ht_enabled, freq->vht_enabled, freq->he_enabled, |  		   freq->freq, freq->ht_enabled, freq->vht_enabled, freq->he_enabled, | ||||||
|  		   freq->bandwidth, freq->center_freq1, freq->center_freq2); |  		   freq->bandwidth, freq->center_freq1, freq->center_freq2); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| --- a/src/drivers/driver_nl80211.c | --- a/src/drivers/driver_nl80211.c | ||||||
| +++ b/src/drivers/driver_nl80211.c | +++ b/src/drivers/driver_nl80211.c | ||||||
| @@ -2918,10 +2918,15 @@ static int wpa_driver_nl80211_del_beacon | @@ -2915,10 +2915,15 @@ static int wpa_driver_nl80211_del_beacon | ||||||
|  	struct nl_msg *msg; |  	struct nl_msg *msg; | ||||||
|  	struct wpa_driver_nl80211_data *drv = bss->drv; |  	struct wpa_driver_nl80211_data *drv = bss->drv; | ||||||
|   |   | ||||||
| @@ -18,7 +18,7 @@ | |||||||
|  	return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL); |  	return send_and_recv_msgs(drv, msg, NULL, NULL, NULL, NULL); | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @@ -5602,7 +5607,7 @@ static void nl80211_teardown_ap(struct i | @@ -5601,7 +5606,7 @@ static void nl80211_teardown_ap(struct i | ||||||
|  		nl80211_mgmt_unsubscribe(bss, "AP teardown"); |  		nl80211_mgmt_unsubscribe(bss, "AP teardown"); | ||||||
|   |   | ||||||
|  	nl80211_put_wiphy_data_ap(bss); |  	nl80211_put_wiphy_data_ap(bss); | ||||||
| @@ -27,7 +27,7 @@ | |||||||
|  } |  } | ||||||
|   |   | ||||||
|   |   | ||||||
| @@ -8051,8 +8056,6 @@ static int wpa_driver_nl80211_if_remove( | @@ -8048,8 +8053,6 @@ static int wpa_driver_nl80211_if_remove( | ||||||
|  	} else { |  	} else { | ||||||
|  		wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context"); |  		wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context"); | ||||||
|  		nl80211_teardown_ap(bss); |  		nl80211_teardown_ap(bss); | ||||||
| @@ -36,7 +36,7 @@ | |||||||
|  		nl80211_destroy_bss(bss); |  		nl80211_destroy_bss(bss); | ||||||
|  		if (!bss->added_if) |  		if (!bss->added_if) | ||||||
|  			i802_set_iface_flags(bss, 0); |  			i802_set_iface_flags(bss, 0); | ||||||
| @@ -8449,7 +8452,6 @@ static int wpa_driver_nl80211_deinit_ap( | @@ -8446,7 +8449,6 @@ static int wpa_driver_nl80211_deinit_ap( | ||||||
|  	if (!is_ap_interface(drv->nlmode)) |  	if (!is_ap_interface(drv->nlmode)) | ||||||
|  		return -1; |  		return -1; | ||||||
|  	wpa_driver_nl80211_del_beacon(bss); |  	wpa_driver_nl80211_del_beacon(bss); | ||||||
| @@ -44,7 +44,7 @@ | |||||||
|   |   | ||||||
|  	/* |  	/* | ||||||
|  	 * If the P2P GO interface was dynamically added, then it is |  	 * If the P2P GO interface was dynamically added, then it is | ||||||
| @@ -8469,7 +8471,6 @@ static int wpa_driver_nl80211_stop_ap(vo | @@ -8466,7 +8468,6 @@ static int wpa_driver_nl80211_stop_ap(vo | ||||||
|  	if (!is_ap_interface(drv->nlmode)) |  	if (!is_ap_interface(drv->nlmode)) | ||||||
|  		return -1; |  		return -1; | ||||||
|  	wpa_driver_nl80211_del_beacon(bss); |  	wpa_driver_nl80211_del_beacon(bss); | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org> | |||||||
|  |  | ||||||
| --- a/src/drivers/driver_nl80211.c | --- a/src/drivers/driver_nl80211.c | ||||||
| +++ b/src/drivers/driver_nl80211.c | +++ b/src/drivers/driver_nl80211.c | ||||||
| @@ -5951,7 +5951,7 @@ static int wpa_driver_nl80211_ibss(struc | @@ -5950,7 +5950,7 @@ static int wpa_driver_nl80211_ibss(struc | ||||||
|  				   struct wpa_driver_associate_params *params) |  				   struct wpa_driver_associate_params *params) | ||||||
|  { |  { | ||||||
|  	struct nl_msg *msg; |  	struct nl_msg *msg; | ||||||
| @@ -19,7 +19,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org> | |||||||
|  	int count = 0; |  	int count = 0; | ||||||
|   |   | ||||||
|  	wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex); |  	wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex); | ||||||
| @@ -5978,6 +5978,37 @@ retry: | @@ -5977,6 +5977,37 @@ retry: | ||||||
|  	    nl80211_put_beacon_int(msg, params->beacon_int)) |  	    nl80211_put_beacon_int(msg, params->beacon_int)) | ||||||
|  		goto fail; |  		goto fail; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -29,7 +29,7 @@ Tested-by: Simon Wunderlich <simon.wunderlich@openmesh.com> | |||||||
|  struct wpa_driver_set_key_params { |  struct wpa_driver_set_key_params { | ||||||
| --- a/src/drivers/driver_nl80211.c | --- a/src/drivers/driver_nl80211.c | ||||||
| +++ b/src/drivers/driver_nl80211.c | +++ b/src/drivers/driver_nl80211.c | ||||||
| @@ -10476,6 +10476,18 @@ static int nl80211_put_mesh_id(struct nl | @@ -10473,6 +10473,18 @@ static int nl80211_put_mesh_id(struct nl | ||||||
|  } |  } | ||||||
|   |   | ||||||
|   |   | ||||||
| @@ -48,7 +48,7 @@ Tested-by: Simon Wunderlich <simon.wunderlich@openmesh.com> | |||||||
|  static int nl80211_put_mesh_config(struct nl_msg *msg, |  static int nl80211_put_mesh_config(struct nl_msg *msg, | ||||||
|  				   struct wpa_driver_mesh_bss_params *params) |  				   struct wpa_driver_mesh_bss_params *params) | ||||||
|  { |  { | ||||||
| @@ -10537,6 +10549,7 @@ static int nl80211_join_mesh(struct i802 | @@ -10534,6 +10546,7 @@ static int nl80211_join_mesh(struct i802 | ||||||
|  	    nl80211_put_basic_rates(msg, params->basic_rates) || |  	    nl80211_put_basic_rates(msg, params->basic_rates) || | ||||||
|  	    nl80211_put_mesh_id(msg, params->meshid, params->meshid_len) || |  	    nl80211_put_mesh_id(msg, params->meshid, params->meshid_len) || | ||||||
|  	    nl80211_put_beacon_int(msg, params->beacon_int) || |  	    nl80211_put_beacon_int(msg, params->beacon_int) || | ||||||
|   | |||||||
| @@ -175,7 +175,7 @@ | |||||||
|  hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface, |  hostapd_alloc_bss_data(struct hostapd_iface *hapd_iface, | ||||||
| --- a/src/drivers/driver_nl80211.c | --- a/src/drivers/driver_nl80211.c | ||||||
| +++ b/src/drivers/driver_nl80211.c | +++ b/src/drivers/driver_nl80211.c | ||||||
| @@ -4820,6 +4820,9 @@ static int wpa_driver_nl80211_set_ap(voi | @@ -4817,6 +4817,9 @@ static int wpa_driver_nl80211_set_ap(voi | ||||||
|  	if (ret) { |  	if (ret) { | ||||||
|  		wpa_printf(MSG_DEBUG, "nl80211: Beacon set failed: %d (%s)", |  		wpa_printf(MSG_DEBUG, "nl80211: Beacon set failed: %d (%s)", | ||||||
|  			   ret, strerror(-ret)); |  			   ret, strerror(-ret)); | ||||||
|   | |||||||
| @@ -60,7 +60,7 @@ | |||||||
|  	struct hapd_interfaces *interfaces = iface->interfaces; |  	struct hapd_interfaces *interfaces = iface->interfaces; | ||||||
| --- a/src/ap/beacon.c | --- a/src/ap/beacon.c | ||||||
| +++ b/src/ap/beacon.c | +++ b/src/ap/beacon.c | ||||||
| @@ -1039,7 +1039,7 @@ void handle_probe_req(struct hostapd_dat | @@ -1042,7 +1042,7 @@ void handle_probe_req(struct hostapd_dat | ||||||
|  	if (hapd->conf->no_probe_resp_if_max_sta && |  	if (hapd->conf->no_probe_resp_if_max_sta && | ||||||
|  	    is_multicast_ether_addr(mgmt->da) && |  	    is_multicast_ether_addr(mgmt->da) && | ||||||
|  	    is_multicast_ether_addr(mgmt->bssid) && |  	    is_multicast_ether_addr(mgmt->bssid) && | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 David Bauer
					David Bauer