From 8fcc511c9a497d60e75f5de56885e5872bc2ca1c Mon Sep 17 00:00:00 2001 From: Thomas Pedersen Date: Thu, 19 Apr 2012 16:29:19 -0700 Subject: [PATCH] --- yaml --- r: 306729 b: refs/heads/master c: 77ed4e45833fc12f3178a65853687b60e952eddd h: refs/heads/master i: 306727: 1637713937ab9dbaf1abcd38a614c85b8bca82b2 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d531c714eb6b..76927d8c751f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37a2f950acc08cce6532138625de0b7caed21476 +refs/heads/master: 77ed4e45833fc12f3178a65853687b60e952eddd diff --git a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c index c8147b953be8..d4172137499a 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -2059,6 +2059,10 @@ static int ath6kl_wow_suspend(struct ath6kl *ar, struct cfg80211_wowlan *wow) u8 index = 0; __be32 ips[MAX_IP_ADDRS]; + /* The FW currently can't support multi-vif WoW properly. */ + if (ar->num_vif > 1) + return -EIO; + vif = ath6kl_vif_first(ar); if (!vif) return -EIO; @@ -3137,6 +3141,10 @@ static int ath6kl_cfg80211_sscan_start(struct wiphy *wiphy, if (vif->sme_state != SME_DISCONNECTED) return -EBUSY; + /* The FW currently can't support multi-vif WoW properly. */ + if (ar->num_vif > 1) + return -EIO; + ath6kl_cfg80211_scan_complete_event(vif, true); ret = ath6kl_set_probed_ssids(ar, vif, request->ssids,