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

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

mac80211_hwsim: 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.

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

drivers/net/wireless/mac80211_hwsim.c

+1 −3
Original line number Diff line number Diff line
@@ -2169,7 +2169,6 @@ static const struct ieee80211_iface_limit hwsim_if_limits[] = { 
#endif

				 BIT(NL80211_IFTYPE_AP) |

				 BIT(NL80211_IFTYPE_P2P_GO) },

	{ .max = 1, .types = BIT(NL80211_IFTYPE_P2P_DEVICE) },

};



static struct ieee80211_iface_combination hwsim_if_comb = {
@@ -2295,8 +2294,7 @@ static int __init init_mac80211_hwsim(void) 
			BIT(NL80211_IFTYPE_P2P_CLIENT) |

			BIT(NL80211_IFTYPE_P2P_GO) |

			BIT(NL80211_IFTYPE_ADHOC) |

			BIT(NL80211_IFTYPE_MESH_POINT) |

			BIT(NL80211_IFTYPE_P2P_DEVICE);

			BIT(NL80211_IFTYPE_MESH_POINT);



		hw->flags = IEEE80211_HW_MFP_CAPABLE |

			    IEEE80211_HW_SIGNAL_DBM |