commit 7e95e365d5399647a41e10059e4b09826b82d78b
author Kalle Valo <kvalo@qca.qualcomm.com> Fri Dec 16 21:10:39 2011 +0200
committer Kalle Valo <kvalo@qca.qualcomm.com> Fri Dec 16 21:10:39 2011 +0200
tree 305c9968798adae3d9484657339fa39d2a5fdaac
parent 3ca9d1fc9aa64077645a26c396de9399b49ea226
parent 5bd5e9a6ae5137a61d0b5c277eac61892d89fc4f

Merge remote branch 'wireless-next/master' into ath6kl-next

Conflicts:
	drivers/net/wireless/ath/ath6kl/init.c

drivers/net/wireless/ath/ath6kl/init.c

diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index c614049..368ecbd 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -1663,6 +1663,7 @@
 
 	ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM |
 			    WIPHY_FLAG_HAVE_AP_SME |
+			    WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |
 			    WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;
 
 	if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN, ar->fw_capabilities))