tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Revert "iwlwifi: mvm: remove P2P_DEVICE support"
This reverts commit eebfc9394ee31b3ef162692c0cd483c1318a4395.
This wasn't intended to be included here, my mistake. I
accidentally merged a mac80211 fixes tree here that had
this change, when it wasn't even intended to be there.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
+13
-1
+13
-1
drivers/net/wireless/iwlwifi/mvm/mac80211.c
+13
-1
drivers/net/wireless/iwlwifi/mvm/mac80211.c
···
84
84
.types = BIT(NL80211_IFTYPE_STATION) |
85
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
+
},
87
96
};
88
97
89
98
static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {
···
161
152
hw->chanctx_data_size = sizeof(struct iwl_mvm_phy_ctxt);
162
153
163
154
hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
164
-
BIT(NL80211_IFTYPE_AP);
155
+
BIT(NL80211_IFTYPE_P2P_CLIENT) |
156
+
BIT(NL80211_IFTYPE_AP) |
157
+
BIT(NL80211_IFTYPE_P2P_GO) |
158
+
BIT(NL80211_IFTYPE_P2P_DEVICE);
165
159
166
160
hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |
167
161
WIPHY_FLAG_DISABLE_BEACON_HINTS |