Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c15a0fb authored by Johannes Berg's avatar Johannes Berg
Browse files

Revert "iwlwifi: mvm: remove P2P_DEVICE support" 



This reverts commit eebfc939.

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: default avatarJohannes Berg <johannes.berg@intel.com>
parent f4d57941

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+13 −1
Original line number Original line Diff line number Diff line
@@ -84,6 +84,15 @@ static const struct ieee80211_iface_limit iwl_mvm_limits[] = { 
		.types = BIT(NL80211_IFTYPE_STATION) |

		.types = BIT(NL80211_IFTYPE_STATION) |

			BIT(NL80211_IFTYPE_AP),

			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[] = {

static const struct ieee80211_iface_combination iwl_mvm_iface_combinations[] = {
@@ -152,7 +161,10 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
	hw->chanctx_data_size = sizeof(struct iwl_mvm_phy_ctxt);

	hw->chanctx_data_size = sizeof(struct iwl_mvm_phy_ctxt);





	hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |

	hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |

		BIT(NL80211_IFTYPE_AP);

		BIT(NL80211_IFTYPE_P2P_CLIENT) |

		BIT(NL80211_IFTYPE_AP) |

		BIT(NL80211_IFTYPE_P2P_GO) |

		BIT(NL80211_IFTYPE_P2P_DEVICE);





	hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |

	hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |

			    WIPHY_FLAG_DISABLE_BEACON_HINTS |

			    WIPHY_FLAG_DISABLE_BEACON_HINTS |