summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CORE/HDD/src/wlan_hdd_p2p.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 931346ecd522..4ec8cc05267c 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -2260,12 +2260,16 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct net_device *dev,
vos_mem_copy( cfgState->buf, buf, len);
mutex_lock(&cfgState->remain_on_chan_ctx_lock);
-
- *cookie = (uintptr_t) cfgState->buf;
- cfgState->action_cookie = *cookie;
- if (cfgState->remain_on_chan_ctx)
- cfgState->remain_on_chan_ctx->cookie = cfgState->action_cookie;
-
+ if( cfgState->remain_on_chan_ctx )
+ {
+ cfgState->action_cookie = cfgState->remain_on_chan_ctx->cookie;
+ *cookie = cfgState->action_cookie;
+ }
+ else
+ {
+ *cookie = (uintptr_t) cfgState->buf;
+ cfgState->action_cookie = *cookie;
+ }
mutex_unlock(&cfgState->remain_on_chan_ctx_lock);
}