From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Fri, 16 Dec 2011 19:10:39 +0000 (+0200)
Subject: Merge remote branch 'wireless-next/master' into ath6kl-next
X-Git-Tag: v3.3-rc1~182^2~44^2~72^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7e95e365d5399647a41e10059e4b09826b82d78b;p=~emulex%2Finfiniband.git

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

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

7e95e365d5399647a41e10059e4b09826b82d78b
diff --cc drivers/net/wireless/ath/ath6kl/init.c
index c614049d7b2,30050af9d4c..368ecbd172a
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@@ -1663,16 -1603,7 +1663,17 @@@ 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_HAS_REMAIN_ON_CHANNEL |
 +			    WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD;
 +
 +	if (test_bit(ATH6KL_FW_CAPABILITY_SCHED_SCAN, ar->fw_capabilities))
 +		ar->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
 +
 +	ar->wiphy->probe_resp_offload =
 +		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS |
 +		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS2 |
 +		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_P2P |
 +		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_80211U;
  
  	set_bit(FIRST_BOOT, &ar->flag);