summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirav Shah <nnshah@qti.qualcomm.com>2014-01-06 19:21:23 +0530
committerPrakash Dhavali <pdhavali@codeaurora.org>2014-01-18 02:43:13 -0800
commit9dd83d1c7ccc237339abbd38fc8fe7a06603c330 (patch)
tree87db94abba03cfbf4007ee6dd14cc348b2fdb71a
parentb483f564db1cc6eee72c76ca4b5e234e03e91d3a (diff)
P2P: Check remaining RoC only in case of GO_NEG_CNF.
Now check remaining RoC only in case of GO_NEG_CNF. and requesting new RoC for all other Resp type action packets. CRs-Fixed: 596484 Change-Id: If83d03fb0738de02f7990293d5a7e96d5464167f
-rw-r--r--CORE/HDD/src/wlan_hdd_p2p.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index c7937989c648..b1d115c5bc79 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -768,8 +768,13 @@ int wlan_hdd_action( struct wiphy *wiphy, struct net_device *dev,
// cause a race condition with lim remain_on_channel_timer which might
// expire by the time the action frame reaches lim layer.
- if ((current_time - cfgState->remain_on_chan_ctx->p2pRemOnChanTimeStamp) >
- (cfgState->remain_on_chan_ctx->duration - 50 ))
+ // Check remaining time of RoC only in case of GO NEG CNF.
+
+ actionFrmType = buf[WLAN_HDD_PUBLIC_ACTION_FRAME_TYPE_OFFSET];
+
+ if ((actionFrmType != WLAN_HDD_GO_NEG_CNF) ||
+ ((current_time - cfgState->remain_on_chan_ctx->p2pRemOnChanTimeStamp) >
+ (cfgState->remain_on_chan_ctx->duration - 50 )))
{
hddLog(LOG1,"action frame: Extending the RoC\n");
status = wlan_hdd_check_remain_on_channel(pAdapter);