84 lines
2.6 KiB
Diff
84 lines
2.6 KiB
Diff
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
|
Date: Mon, 15 Jul 2013 14:44:58 +0300
|
|
Subject: iwlwifi: mvm: support BSS only
|
|
Origin: http://mid.gmane.org/1373888700-3040-2-git-send-email-emmanuel.grumbach@intel.com
|
|
Forwarded: not-needed
|
|
|
|
Only BSS is supported in 3.10. In later kernels, other modes
|
|
have been fixed and tested to work.
|
|
This will at least allow user to use the regular wifi
|
|
functionality.
|
|
|
|
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
|
|
---
|
|
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 36 +--------------------------
|
|
1 file changed, 1 insertion(+), 35 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
|
|
index a5eb8c8..5b1b86f 100644
|
|
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
|
|
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
|
|
@@ -78,32 +78,6 @@
|
|
#include "fw-api-scan.h"
|
|
#include "iwl-phy-db.h"
|
|
|
|
-static const struct ieee80211_iface_limit iwl_mvm_limits[] = {
|
|
- {
|
|
- .max = 1,
|
|
- .types = BIT(NL80211_IFTYPE_STATION) |
|
|
- BIT(NL80211_IFTYPE_AP),
|
|
- },
|
|
- {
|
|
- .max = 1,
|
|
- .types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
|
|
- BIT(NL80211_IFTYPE_P2P_GO),
|
|
- },
|
|
- {
|
|
- .max = 1,
|
|
- .types = BIT(NL80211_IFTYPE_P2P_DEVICE),
|
|
- },
|
|
-};
|
|
-
|
|
-static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {
|
|
- {
|
|
- .num_different_channels = 1,
|
|
- .max_interfaces = 3,
|
|
- .limits = iwl_mvm_limits,
|
|
- .n_limits = ARRAY_SIZE(iwl_mvm_limits),
|
|
- },
|
|
-};
|
|
-
|
|
#ifdef CONFIG_PM_SLEEP
|
|
static const struct nl80211_wowlan_tcp_data_token_feature
|
|
iwl_mvm_wowlan_tcp_token_feature = {
|
|
@@ -160,20 +134,12 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
|
|
hw->vif_data_size = sizeof(struct iwl_mvm_vif);
|
|
hw->chanctx_data_size = sizeof(struct iwl_mvm_phy_ctxt);
|
|
|
|
- hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
|
|
- BIT(NL80211_IFTYPE_P2P_CLIENT) |
|
|
- BIT(NL80211_IFTYPE_AP) |
|
|
- BIT(NL80211_IFTYPE_P2P_GO) |
|
|
- BIT(NL80211_IFTYPE_P2P_DEVICE);
|
|
+ hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
|
|
|
|
hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
|
|
WIPHY_FLAG_DISABLE_BEACON_HINTS |
|
|
WIPHY_FLAG_IBSS_RSN;
|
|
|
|
- hw->wiphy->iface_combinations = iwl_mvm_iface_combinations;
|
|
- hw->wiphy->n_iface_combinations =
|
|
- ARRAY_SIZE(iwl_mvm_iface_combinations);
|
|
-
|
|
hw->wiphy->max_remain_on_channel_duration = 10000;
|
|
hw->max_listen_interval = IWL_CONN_MAX_LISTEN_INTERVAL;
|
|
|
|
--
|
|
1.7.10.4
|
|
|
|
--
|
|
To unsubscribe from this list: send the line "unsubscribe stable" in
|
|
the body of a message to majordomo@vger.kernel.org
|
|
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
|
|