From 7018796754908e36d07017cec9e7a3f26d571d4f Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 14 Dec 2011 09:29:15 +0100
Subject: [PATCH] --- yaml --- r: 278975 b: refs/heads/master c:
 d83023daa219486e9aa139d423308a045bf0438b h: refs/heads/master i:   278973:
 d0ed053b1b91efd54fbfa5f153d45b79d45bf161   278971:
 ee688d33bb1a0579da0b127f41b7a8c6ce3911ae   278967:
 d2dd6f9ce0572aec6daa9ab29968a8842e3d08f5   278959:
 6297f8b9059b984b1280817a6a3a332b78f18e71   278943:
 bc07f14675888f3655221f49036aee9f8c4e0f01   278911:
 84243d682dd8bad0daa7b0e99906655edca72e17 v: v3

---
 [refs]                       | 2 +-
 trunk/net/wireless/nl80211.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ce77e88b71ba..afed1b57c548 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c99f895a231b2dfeedd27e4d218a1b2d22cf4d02
+refs/heads/master: d83023daa219486e9aa139d423308a045bf0438b
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 4d708cea390f..d86428145c32 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -2246,6 +2246,7 @@ static const struct nla_policy sta_flags_policy[NL80211_STA_FLAG_MAX + 1] = {
 	[NL80211_STA_FLAG_WME] = { .type = NLA_FLAG },
 	[NL80211_STA_FLAG_MFP] = { .type = NLA_FLAG },
 	[NL80211_STA_FLAG_AUTHENTICATED] = { .type = NLA_FLAG },
+	[NL80211_STA_FLAG_TDLS_PEER] = { .type = NLA_FLAG },
 };
 
 static int parse_station_flags(struct genl_info *info,