From 600d6b622a1ae7e2d7e910098fae9ebd05961eba Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Sun, 7 Apr 2013 19:32:47 +0200
Subject: [PATCH] --- yaml --- r: 369567 b: refs/heads/master c:
 a21a4d3e8ad4d513f5a6eefc91510febb205f601 h: refs/heads/master i:   369565:
 823efa16b263c5b9af78fb5a5d23d1d24290eeeb   369563:
 205dd2593c4e8a657e3804a08da247a2728a6e62   369559:
 6a757f4e8b857dcaa58f0f4856037030e8b1d5d3   369551:
 c74e543747bd2b4b3890f159c0ac8d3360eb8e3b   369535:
 c1ad7d9b2787167964c6f888cb5aeb83ee791c02 v: v3

---
 [refs]                    |  2 +-
 trunk/net/mac80211/mlme.c | 32 --------------------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/[refs] b/[refs]
index d07a7895bb31..6e1630cf5043 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0eabccd940f0f25da0ae29e555fddb8fb84d8e27
+refs/heads/master: a21a4d3e8ad4d513f5a6eefc91510febb205f601
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 79647eaecc8d..cf40fac0aae8 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -604,7 +604,6 @@ static void ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata,
 	u8 *pos;
 	u32 cap;
 	struct ieee80211_sta_vht_cap vht_cap;
-	int i;
 
 	BUILD_BUG_ON(sizeof(vht_cap) != sizeof(sband->vht_cap));
 
@@ -632,37 +631,6 @@ static void ieee80211_add_vht_ie(struct ieee80211_sub_if_data *sdata,
 			cpu_to_le32(IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE)))
 		cap &= ~IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE;
 
-	if (!(ap_vht_cap->vht_cap_info &
-			cpu_to_le32(IEEE80211_VHT_CAP_TXSTBC)))
-		cap &= ~(IEEE80211_VHT_CAP_RXSTBC_1 |
-			 IEEE80211_VHT_CAP_RXSTBC_3 |
-			 IEEE80211_VHT_CAP_RXSTBC_4);
-
-	for (i = 0; i < 8; i++) {
-		int shift = i * 2;
-		u16 mask = IEEE80211_VHT_MCS_NOT_SUPPORTED << shift;
-		u16 ap_mcs, our_mcs;
-
-		ap_mcs = (le16_to_cpu(ap_vht_cap->supp_mcs.tx_mcs_map) &
-								mask) >> shift;
-		our_mcs = (le16_to_cpu(vht_cap.vht_mcs.rx_mcs_map) &
-								mask) >> shift;
-
-		if (our_mcs == IEEE80211_VHT_MCS_NOT_SUPPORTED)
-			continue;
-
-		switch (ap_mcs) {
-		default:
-			if (our_mcs <= ap_mcs)
-				break;
-			/* fall through */
-		case IEEE80211_VHT_MCS_NOT_SUPPORTED:
-			vht_cap.vht_mcs.rx_mcs_map &= cpu_to_le16(~mask);
-			vht_cap.vht_mcs.rx_mcs_map |=
-				cpu_to_le16(ap_mcs << shift);
-		}
-	}
-
 	/* reserve and fill IE */
 	pos = skb_put(skb, sizeof(struct ieee80211_vht_cap) + 2);
 	ieee80211_ie_build_vht_cap(pos, &vht_cap, cap);