P2P: Cancel pending action TX radio work on p2p_cancel

When p2p_cancel is invoked while the GO Negotiation Action TX was
pending, the p2p_send_action_work was not getting cleared.

Signed-off-by: Jithu Jance <jithu@broadcom.com>

diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c
index f1269ad7c90178663ef25b757f478a236c6523e2..57e4e375f07549480f1a36384fa350abf32883cf 100644 (file)
--- a/wpa_supplicant/p2p_supplicant.c
+++ b/wpa_supplicant/p2p_supplicant.c
@@ -967,16 +967,8 @@ static void wpas_p2p_send_action_work_timeout(void *eloop_ctx,
 }
 
 
-static void wpas_p2p_send_action_tx_status(struct wpa_supplicant *wpa_s,
-                                          unsigned int freq,
-                                          const u8 *dst, const u8 *src,
-                                          const u8 *bssid,
-                                          const u8 *data, size_t data_len,
-                                          enum offchannel_send_action_result
-                                          result)
+static void wpas_p2p_action_tx_clear(struct wpa_supplicant *wpa_s)
 {
-       enum p2p_send_action_result res = P2P_SEND_ACTION_SUCCESS;
-
        if (wpa_s->p2p_send_action_work) {
                struct send_action_work *awork;
                awork = wpa_s->p2p_send_action_work->ctx;
@@ -999,6 +991,20 @@ static void wpas_p2p_send_action_tx_status(struct wpa_supplicant *wpa_s,
                                wpa_s, NULL);
                }
        }
+}
+
+
+static void wpas_p2p_send_action_tx_status(struct wpa_supplicant *wpa_s,
+                                          unsigned int freq,
+                                          const u8 *dst, const u8 *src,
+                                          const u8 *bssid,
+                                          const u8 *data, size_t data_len,
+                                          enum offchannel_send_action_result
+                                          result)
+{
+       enum p2p_send_action_result res = P2P_SEND_ACTION_SUCCESS;
+
+       wpas_p2p_action_tx_clear(wpa_s);
 
        if (wpa_s->global->p2p == NULL || wpa_s->global->p2p_disabled)
                return;
@@ -5684,6 +5690,8 @@ static void wpas_p2p_clear_pending_action_tx(struct wpa_supplicant *wpa_s)
        if (!offchannel_pending_action_tx(wpa_s))
                return;
 
+       wpas_p2p_action_tx_clear(wpa_s);
+
        wpa_printf(MSG_DEBUG, "P2P: Drop pending Action TX due to new "
                   "operation request");
        offchannel_clear_pending_action_tx(wpa_s);