Revert "mac80211_hwsim: remove P2P_DEVICE support"

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

This reverts commit e3ee68b7b049c5bbfcb78a179c00c373a38ed58c.

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>

Johannes Berg 13 years ago a8cd57b3 3c15a0fb

+3 -1

1 changed file

expand all

drivers

net

wireless

mac80211_hwsim.c

+3 -1

drivers/net/wireless/mac80211_hwsim.c

··· 2169 2169 #endif 2170 2170 BIT(NL80211_IFTYPE_AP) | 2171 2171 BIT(NL80211_IFTYPE_P2P_GO) }, 2172 + { .max = 1, .types = BIT(NL80211_IFTYPE_P2P_DEVICE) }, 2172 2173 }; 2173 2174 2174 2175 static struct ieee80211_iface_combination hwsim_if_comb = { ··· 2295 2294 BIT(NL80211_IFTYPE_P2P_CLIENT) | 2296 2295 BIT(NL80211_IFTYPE_P2P_GO) | 2297 2296 BIT(NL80211_IFTYPE_ADHOC) | 2298 - BIT(NL80211_IFTYPE_MESH_POINT); 2297 + BIT(NL80211_IFTYPE_MESH_POINT) | 2298 + BIT(NL80211_IFTYPE_P2P_DEVICE); 2299 2299 2300 2300 hw->flags = IEEE80211_HW_MFP_CAPABLE | 2301 2301 IEEE80211_HW_SIGNAL_DBM |