From c9fc12425681d7d9ab34dea9f5151a8f6dee2709 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Fri, 20 Jan 2023 18:02:26 +0200 Subject: [PATCH] P2P: Make wpas_p2p_notif_pbc_overlap() static Commit ace0fbdb69b4 ("P2P: Fix segfault when PBC overlap is detected") removed the external calls to this function, but did not mark it static. Mark it static now to clarify expected uses through the wpas_p2p_pbc_overlap_cb() timer handler. Signed-off-by: Jouni Malinen --- wpa_supplicant/p2p_supplicant.c | 2 +- wpa_supplicant/p2p_supplicant.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c index 6cf5a485f..894b6ba26 100644 --- a/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant/p2p_supplicant.c @@ -8319,7 +8319,7 @@ static void wpas_p2p_cross_connect_setup(struct wpa_supplicant *wpa_s) } -int wpas_p2p_notif_pbc_overlap(struct wpa_supplicant *wpa_s) +static int wpas_p2p_notif_pbc_overlap(struct wpa_supplicant *wpa_s) { if (wpa_s->p2p_group_interface != P2P_GROUP_INTERFACE_CLIENT && !wpa_s->p2p_in_provisioning) diff --git a/wpa_supplicant/p2p_supplicant.h b/wpa_supplicant/p2p_supplicant.h index 11cc9c390..907ac8cca 100644 --- a/wpa_supplicant/p2p_supplicant.h +++ b/wpa_supplicant/p2p_supplicant.h @@ -206,7 +206,6 @@ void wpas_p2p_cancel_remain_on_channel_cb(struct wpa_supplicant *wpa_s, void wpas_p2p_interface_unavailable(struct wpa_supplicant *wpa_s); void wpas_p2p_notif_connected(struct wpa_supplicant *wpa_s); void wpas_p2p_notif_disconnected(struct wpa_supplicant *wpa_s); -int wpas_p2p_notif_pbc_overlap(struct wpa_supplicant *wpa_s); int wpas_p2p_4way_hs_failed(struct wpa_supplicant *wpa_s); void wpas_p2p_ap_setup_failed(struct wpa_supplicant *wpa_s); bool wpas_p2p_retry_limit_exceeded(struct wpa_supplicant *wpa_s); @@ -304,11 +303,6 @@ static inline void wpas_p2p_notif_disconnected(struct wpa_supplicant *wpa_s) { } -static inline int wpas_p2p_notif_pbc_overlap(struct wpa_supplicant *wpa_s) -{ - return 0; -} - static inline int wpas_p2p_4way_hs_failed(struct wpa_supplicant *wpa_s) { return 0;