summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEyal Shapira <eyal@wizery.com>2013-03-12 17:19:41 +0200
committerLuciano Coelho <coelho@ti.com>2013-03-25 12:33:12 +0200
commitc0ad2f2e66ffc46eb474d0060db9af254ed69177 (patch)
tree75ca1d0a41b6e9bcd82497a51738751e6cbca341 /drivers
parent8910cfa3ac022feebfe1c4ae021afc34a1c1af25 (diff)
downloadlinux-c0ad2f2e66ffc46eb474d0060db9af254ed69177.tar.bz2
wlcore: don't attempt to roam in case of p2p
For STA we report beacon loss to higher levels so that wpa_s can attempt to roam without disconnecting. In case of P2P CLI we don't want to attempt roaming and instead disconnect immediately upon beacon loss. Signed-off-by: Eyal Shapira <eyal@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ti/wlcore/event.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/event.c b/drivers/net/wireless/ti/wlcore/event.c
index 70f289aa1bc6..67f61689b49e 100644
--- a/drivers/net/wireless/ti/wlcore/event.c
+++ b/drivers/net/wireless/ti/wlcore/event.c
@@ -237,6 +237,14 @@ void wlcore_event_beacon_loss(struct wl1271 *wl, unsigned long roles_bitmap)
!test_bit(wlvif->role_id , &roles_bitmap))
continue;
+ vif = wl12xx_wlvif_to_vif(wlvif);
+
+ /* don't attempt roaming in case of p2p */
+ if (wlvif->p2p) {
+ ieee80211_connection_loss(vif);
+ continue;
+ }
+
/*
* if the work is already queued, it should take place.
* We don't want to delay the connection loss
@@ -246,7 +254,6 @@ void wlcore_event_beacon_loss(struct wl1271 *wl, unsigned long roles_bitmap)
&wlvif->connection_loss_work,
msecs_to_jiffies(delay));
- vif = wl12xx_wlvif_to_vif(wlvif);
ieee80211_cqm_rssi_notify(
vif,
NL80211_CQM_RSSI_BEACON_LOSS_EVENT,