summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bondar <alexander.bondar@intel.com>2013-04-09 17:14:09 +0300
committerJohannes Berg <johannes.berg@intel.com>2013-04-16 15:29:47 +0200
commit7a7da6ee0ea3443cd5111adffa80a3daba4bb8df (patch)
tree66939d9544d6f57447204bf907a187c2d5d78a34
parentcd64f2a9b4a9eb055e4adc14b559055775b1b62f (diff)
downloadlinux-3.10-7a7da6ee0ea3443cd5111adffa80a3daba4bb8df.tar.gz
linux-3.10-7a7da6ee0ea3443cd5111adffa80a3daba4bb8df.tar.bz2
linux-3.10-7a7da6ee0ea3443cd5111adffa80a3daba4bb8df.zip
mac80211: remove warning from ieee80211_beacon_loss
Currently, mac80211 assumes that connection monitor offload for BSS station implies that the device: - sends periodic keep alive packets to associated AP - monitors missed beacons - actively probes the AP in case of missed beacons In case of poor connection conditions it expects the function ieee80211_connection_loss() to be called by driver. However, some devices implement connection monitor offload excluding active AP probing. To allow them to call ieee80211_beacon_loss() cleanly, remove the warning there and thus allow them to use mac80211 for the AP probing even if connection monitor offload is supported. Signed-off-by: Alexander Bondar <alexander.bondar@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/mac80211/mlme.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 43023f0db68..c7860d0450d 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -2215,7 +2215,6 @@ void ieee80211_beacon_loss(struct ieee80211_vif *vif)
trace_api_beacon_loss(sdata);
- WARN_ON(hw->flags & IEEE80211_HW_CONNECTION_MONITOR);
sdata->u.mgd.connection_loss = false;
ieee80211_queue_work(hw, &sdata->u.mgd.beacon_connection_loss_work);
}