summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/ath/ath6kl/wmi.c
diff options
context:
space:
mode:
authorKalle Valo <kvalo@codeaurora.org>2016-04-07 18:44:37 (GMT)
committerKalle Valo <kvalo@codeaurora.org>2016-04-07 18:44:37 (GMT)
commit20ac1b325d8d526211b1276ecf9b64b7e8369f50 (patch)
treebe1ba1632c74adf873f505cb1251ee07ab6fbdd4 /drivers/net/wireless/ath/ath6kl/wmi.c
parent4646968b94bdf88ae3c507c347d03acd5798939d (diff)
parent689de38e37179c6f524dd003e1dae92042f8f5cd (diff)
downloadlinux-20ac1b325d8d526211b1276ecf9b64b7e8369f50.tar.xz
Merge ath-next from ath.git
ath.git patches for 4.7. Major changes: ath10k * implement push-pull tx model using mac80211 software queuing support * enable scan in AP mode (NL80211_FEATURE_AP_SCAN) wil6210 * add basic PBSS (Personal Basic Service Set) support * add initial P2P support * add oob_mode module parameter
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/wmi.c')
-rw-r--r--drivers/net/wireless/ath/ath6kl/wmi.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index a5e1de7..0b3e9c0 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -1584,6 +1584,11 @@ static int ath6kl_wmi_txe_notify_event_rx(struct wmi *wmi, u8 *datap, int len,
if (len < sizeof(*ev))
return -EINVAL;
+ if (vif->nw_type != INFRA_NETWORK ||
+ !test_bit(ATH6KL_FW_CAPABILITY_TX_ERR_NOTIFY,
+ vif->ar->fw_capabilities))
+ return -EOPNOTSUPP;
+
if (vif->sme_state != SME_CONNECTED)
return -ENOTCONN;