From 12af1a48a4ec553b7070c5c7aa4572f03bb0f6b4 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 19 Jun 2012 17:29:29 +0200
Subject: [PATCH] --- yaml --- r: 327663 b: refs/heads/master c:
 8b3d1cc213f96bfffb5b7808d859b9ad26149e82 h: refs/heads/master i:   327661:
 fc162cbb7c9f30c1c3c27442bfa7f851a519326b   327659:
 3d7d9e73e1035ca0a3d92bd79e06ac5df1a2afe2   327655:
 1227b7dcdae0ffc0ab5bd52735181cc18a07dce4   327647:
 05535b9995aae994c14fd1f0fa0bced873c8b939 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/mac80211_hwsim.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6fc107358468..6d4ebeaf7636 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d71117a279aa30574a8af6c7348570c292285c2
+refs/heads/master: 8b3d1cc213f96bfffb5b7808d859b9ad26149e82
diff --git a/trunk/drivers/net/wireless/mac80211_hwsim.c b/trunk/drivers/net/wireless/mac80211_hwsim.c
index ed1386aa3b17..7bb032e1b789 100644
--- a/trunk/drivers/net/wireless/mac80211_hwsim.c
+++ b/trunk/drivers/net/wireless/mac80211_hwsim.c
@@ -1734,6 +1734,7 @@ 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 const struct ieee80211_iface_combination hwsim_if_comb = {
@@ -1820,7 +1821,8 @@ 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_MESH_POINT) |
+			BIT(NL80211_IFTYPE_P2P_DEVICE);
 
 		hw->flags = IEEE80211_HW_MFP_CAPABLE |
 			    IEEE80211_HW_SIGNAL_DBM |