[PATCH v5 2/3] P2P: optimize join scan freq

[Jouni Malinen]

On Tue, Feb 21, 2023 at 04:46:16PM -0800, Matthew Wang wrote:
> Allow clients to specify the BSSID of an auto GO. If the auto GO has been
> discovered on another interface, optimize scan frequency by performing
> a single channel scan first. Android and ChromeOS use this to streamline
> auto GO discovery.

Thanks, applied with some cleanup and a compilation (merge conflict?)
fix:

> diff --git a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
> +	u8 go_bssid[ETH_ALEN] = {0};

>  		if (wpas_p2p_group_add_persistent(wpa_s, ssid, 0, freq, 0, 0, 0,
>  						  0, 0, 0, 0, NULL, 0, 0,
> -						  false, retry_limit)) {
> +						  false, retry_limit,
> +						  go_bssid)) {

I replaced this with NULL to indicate no-value instead of depending on
the all-zeros address to be used.

> diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
>  static int wpas_start_p2p_client(struct wpa_supplicant *wpa_s,
>  				 struct wpa_ssid *params, int addr_allocated,
> -				 int freq, int force_scan, int retry_limit)
> +				 int freq, int force_scan, int retry_limit,
> +				 const u8 *go_bssid)

> diff --git a/wpa_supplicant/p2p_supplicant.h b/wpa_supplicant/p2p_supplicant.h
> +++ b/wpa_supplicant/p2p_supplicant.h
> @@ -52,7 +52,7 @@ int wpas_p2p_group_add_persistent(struct wpa_supplicant *wpa_s,
>  				  int max_oper_chwidth, int he, int edmg,
>  				  const struct p2p_channels *channels,
>  				  int connection_timeout, int force_scan,
> -				  bool allow_6ghz, int retry_limit);
> +				  const u8 *go_bssid);

That does not match the function implementation, i.e., those two
arguments should not have been deleted in the function prototype..

-- 
Jouni Malinen                                            PGP id EFC895FA