From adc4db5a838648f88049696923c541ae305e29a2 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 14 Dec 2011 12:20:28 +0100
Subject: [PATCH] --- yaml --- r: 278977 b: refs/heads/master c:
 92b62f28d02d3aafd824062f0ea57cc36fbc59d6 h: refs/heads/master i:   278975:
 7018796754908e36d07017cec9e7a3f26d571d4f v: v3

---
 [refs]                   |  2 +-
 trunk/net/mac80211/cfg.c | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 00a06b9111c2..df1976e98e83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bdd90d5e36a55271beb957b3d7ca3e29b2a90207
+refs/heads/master: 92b62f28d02d3aafd824062f0ea57cc36fbc59d6
diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c
index 944051b43bad..bc83a6605ea6 100644
--- a/trunk/net/mac80211/cfg.c
+++ b/trunk/net/mac80211/cfg.c
@@ -896,12 +896,6 @@ static int ieee80211_add_station(struct wiphy *wiphy, struct net_device *dev,
 	if (is_multicast_ether_addr(mac))
 		return -EINVAL;
 
-	/* Only TDLS-supporting stations can add TDLS peers */
-	if ((params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER)) &&
-	    !((wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS) &&
-	      sdata->vif.type == NL80211_IFTYPE_STATION))
-		return -ENOTSUPP;
-
 	sta = sta_info_alloc(sdata, mac, GFP_KERNEL);
 	if (!sta)
 		return -ENOMEM;
@@ -968,14 +962,6 @@ static int ieee80211_change_station(struct wiphy *wiphy,
 		return -ENOENT;
 	}
 
-	/* The TDLS bit cannot be toggled after the STA was added */
-	if ((params->sta_flags_mask & BIT(NL80211_STA_FLAG_TDLS_PEER)) &&
-	    !!(params->sta_flags_set & BIT(NL80211_STA_FLAG_TDLS_PEER)) !=
-	    !!test_sta_flag(sta, WLAN_STA_TDLS_PEER)) {
-		rcu_read_unlock();
-		return -EINVAL;
-	}
-
 	/* in station mode, supported rates are only valid with TDLS */
 	if (sdata->vif.type == NL80211_IFTYPE_STATION &&
 	    params->supported_rates &&