forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	drivers/net/wireless/ath/ath6kl/init.c
This commit is contained in:
Kalle Valo 2011-12-16 21:10:39 +02:00
commit 7e95e365d5
7655 changed files with 342408 additions and 170690 deletions
Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/wireless/ath/ath6kl/init.c
View file

@ -1663,6 +1663,7 @@ int ath6kl_core_init(struct ath6kl *ar)
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))