diff --git a/[refs] b/[refs] index a7a3cf27a045..cc278bc7dff3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb0b4beb93d14429bf0c50fc1ab8e26348dca880 +refs/heads/master: c1e6fb1aad0d4d4f032d46b6bab093a41c6c82bf diff --git a/trunk/net/wireless/mlme.c b/trunk/net/wireless/mlme.c index f7dc7524e145..960bf60e44e5 100644 --- a/trunk/net/wireless/mlme.c +++ b/trunk/net/wireless/mlme.c @@ -122,15 +122,9 @@ void cfg80211_send_deauth(struct net_device *dev, const u8 *buf, size_t len) break; } } -/* - * mac80211 currently triggers this warning, - * so disable for now (it's harmless, just - * means that we got a spurious event) WARN_ON(!done); - */ - if (wdev->sme_state == CFG80211_SME_CONNECTED) { u16 reason_code; bool from_ap;