diff --git a/[refs] b/[refs] index bc84e49be8f3..f285b435162a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd64f2a9b4a9eb055e4adc14b559055775b1b62f +refs/heads/master: 7a7da6ee0ea3443cd5111adffa80a3daba4bb8df diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 43023f0db68c..c7860d0450dd 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/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); }