فهرست منبع

iwlwifi: change the default P2P support to "Yes"

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Wey-Yi Guy 13 سال پیش
والد
کامیت
ef213d6d7e
2فایلهای تغییر یافته به همراه16 افزوده شده و 15 حذف شده
  1. 15 14
      drivers/net/wireless/iwlwifi/Kconfig
  2. 1 1
      drivers/net/wireless/iwlwifi/iwl-agn.c

+ 15 - 14
drivers/net/wireless/iwlwifi/Kconfig

@@ -113,20 +113,21 @@ config IWLWIFI_DEVICE_TESTMODE
 	  generic netlink message via NL80211_TESTMODE channel.
 	  generic netlink message via NL80211_TESTMODE channel.
 
 
 config IWLWIFI_P2P
 config IWLWIFI_P2P
-       bool "iwlwifi experimental P2P support"
-       depends on IWLWIFI
-       help
-         This option enables experimental P2P support for some devices
-         based on microcode support. Since P2P support is still under
-         development, this option may even enable it for some devices
-         now that turn out to not support it in the future due to
-         microcode restrictions.
-
-         To determine if your microcode supports the experimental P2P
-         offered by this option, check if the driver advertises AP
-         support when it is loaded.
-
-         Say Y only if you want to experiment with P2P.
+	def_bool y
+	bool "iwlwifi experimental P2P support"
+	depends on IWLWIFI
+	help
+	  This option enables experimental P2P support for some devices
+	  based on microcode support. Since P2P support is still under
+	  development, this option may even enable it for some devices
+	  now that turn out to not support it in the future due to
+	  microcode restrictions.
+
+	  To determine if your microcode supports the experimental P2P
+	  offered by this option, check if the driver advertises AP
+	  support when it is loaded.
+
+	  Say Y only if you want to experiment with P2P.
 
 
 config IWLWIFI_EXPERIMENTAL_MFP
 config IWLWIFI_EXPERIMENTAL_MFP
 	bool "support MFP (802.11w) even if uCode doesn't advertise"
 	bool "support MFP (802.11w) even if uCode doesn't advertise"

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-agn.c

@@ -1564,7 +1564,7 @@ static struct iwl_op_mode *iwl_op_mode_dvm_start(struct iwl_trans *trans,
 	ucode_flags = fw->ucode_capa.flags;
 	ucode_flags = fw->ucode_capa.flags;
 
 
 #ifndef CONFIG_IWLWIFI_P2P
 #ifndef CONFIG_IWLWIFI_P2P
-	ucode_flags &= ~IWL_UCODE_TLV_FLAGS_PAN;
+	ucode_flags &= ~IWL_UCODE_TLV_FLAGS_P2P;
 #endif
 #endif
 
 
 	if (ucode_flags & IWL_UCODE_TLV_FLAGS_PAN) {
 	if (ucode_flags & IWL_UCODE_TLV_FLAGS_PAN) {