diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index dd158ec571fb..11dc7df8bdf9 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c | |||
@@ -84,15 +84,6 @@ static const struct ieee80211_iface_limit iwl_mvm_limits[] = { | |||
84 | .types = BIT(NL80211_IFTYPE_STATION) | | 84 | .types = BIT(NL80211_IFTYPE_STATION) | |
85 | BIT(NL80211_IFTYPE_AP), | 85 | BIT(NL80211_IFTYPE_AP), |
86 | }, | 86 | }, |
87 | { | ||
88 | .max = 1, | ||
89 | .types = BIT(NL80211_IFTYPE_P2P_CLIENT) | | ||
90 | BIT(NL80211_IFTYPE_P2P_GO), | ||
91 | }, | ||
92 | { | ||
93 | .max = 1, | ||
94 | .types = BIT(NL80211_IFTYPE_P2P_DEVICE), | ||
95 | }, | ||
96 | }; | 87 | }; |
97 | 88 | ||
98 | static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = { | 89 | static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = { |
@@ -161,10 +152,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) | |||
161 | hw->chanctx_data_size = sizeof(struct iwl_mvm_phy_ctxt); | 152 | hw->chanctx_data_size = sizeof(struct iwl_mvm_phy_ctxt); |
162 | 153 | ||
163 | hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | | 154 | hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | |
164 | BIT(NL80211_IFTYPE_P2P_CLIENT) | | 155 | BIT(NL80211_IFTYPE_AP); |
165 | BIT(NL80211_IFTYPE_AP) | | ||
166 | BIT(NL80211_IFTYPE_P2P_GO) | | ||
167 | BIT(NL80211_IFTYPE_P2P_DEVICE); | ||
168 | 156 | ||
169 | hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY | | 157 | hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY | |
170 | WIPHY_FLAG_DISABLE_BEACON_HINTS | | 158 | WIPHY_FLAG_DISABLE_BEACON_HINTS | |