From: Ben Greear <greearb@candelatech.com>
Date: Mon, 25 Mar 2013 18:19:35 +0000 (-0700)
Subject: mac80211: be more careful about sending beacon-loss-events
X-Git-Tag: Ubuntu-5.2.0-15.16~15790^2~43^2^2~98^2~16
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a13fbe549fded5b77e020d4e08f1f74e212cc543;p=mirror_ubuntu-eoan-kernel.git

mac80211: be more careful about sending beacon-loss-events

I don't think we should send the events unless it was actually
a beacon that was lost...not just any probe of an AP.

Signed-off-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 237e2ef42ba9..e12fedcfa988 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1988,13 +1988,15 @@ static void ieee80211_mgd_probe_ap(struct ieee80211_sub_if_data *sdata,
 		goto out;
 	}
 
-	if (beacon)
+	if (beacon) {
 		mlme_dbg_ratelimited(sdata,
 				     "detected beacon loss from AP (missed %d beacons) - probing\n",
 				     beacon_loss_count);
 
-	ieee80211_cqm_rssi_notify(&sdata->vif,
-		NL80211_CQM_RSSI_BEACON_LOSS_EVENT, GFP_KERNEL);
+		ieee80211_cqm_rssi_notify(&sdata->vif,
+					  NL80211_CQM_RSSI_BEACON_LOSS_EVENT,
+					  GFP_KERNEL);
+	}
 
 	/*
 	 * The driver/our work has already reported this event or the