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

Commit eebfc939 authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: mvm: remove P2P_DEVICE support 



Unfortunately, advertising P2P_DEVICE support was a little
premature, a number of issues came up in testing and have
been fixed for 3.10. Rather than try to backport all the
different fixes, disable P2P_DEVICE support in the drivers
using it. For iwlmvm that implies disabling P2P completely
as it can't support P2P operation w/o P2P Device.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4325d724

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

+1 −13
Original line number Diff line number Diff line
@@ -84,15 +84,6 @@ static const struct ieee80211_iface_limit iwl_mvm_limits[] = { 
		.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[] = {
@@ -161,10 +152,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
	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);

		BIT(NL80211_IFTYPE_AP);



	hw->wiphy->flags |= WIPHY_FLAG_CUSTOM_REGULATORY |

			    WIPHY_FLAG_DISABLE_BEACON_HINTS |