Revert "wlan: Fix race condition for reliable delivery of action frames."
This reverts commit 5ceca36b86344ce120b8fa4b441c4d7081f1fc45.
This fix will notify supplicant about cancel remain on channel,
but in host a new remain on channel will be started.
Supplicant will come out of listen state and can send new remain
on channel event again. It's always better to tell supplicant about
all remain on channel event.
Change-Id: I08fe57596083dc3e4fc6c2ea69f0475f57c560e9
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 88c0651..0c8af11 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -732,7 +732,7 @@
extendedWait = (tANI_U16)wait;
goto send_frame;
}
- remain_on_channel:
+
INIT_COMPLETION(pAdapter->offchannel_tx_event);
status = wlan_hdd_request_remain_on_channel(wiphy, dev,
@@ -801,15 +801,6 @@
#endif
*cookie = (uintptr_t) cfgState->buf;
cfgState->action_cookie = *cookie;
- /*There is race between expiration of remain on channel
- in driver and also sending an action frame in wlan_hdd_action.
- As the remain on chan context is NULL here , which means
- LIM remain on channel timer expired and
- wlan_hdd_remain_on_channel_callback has cleared
- cfgState->remain_on_chan_ctx to NULL so let's
- do a fresh remain on channel.
- */
- goto remain_on_channel;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
}
#endif