From 24470c6b87dd84449946e6a3dd7712e804bdc72c Mon Sep 17 00:00:00 2001 From: Alwin Beukers Date: Thu, 10 Nov 2011 20:30:20 +0100 Subject: [PATCH] --- yaml --- r: 277875 b: refs/heads/master c: e9ca530a7b183691d9799fd40772c2cd398b494a h: refs/heads/master i: 277873: 29c46977780450c221c04f780f83210813883b6f 277871: 21e5d6299f374248a53bff4c12e7adb189514d40 v: v3 --- [refs] | 2 +- .../drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 1c2082574eb5..f8e583d494e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0f24c8a9328b58c2881e6a1c139110700a1a584 +refs/heads/master: e9ca530a7b183691d9799fd40772c2cd398b494a diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c index 8e35c62d0bb1..6d3c7b6c5aa0 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c @@ -619,13 +619,6 @@ brcms_ops_sta_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, wl->pub->global_ampdu->scb = scb; wl->pub->global_ampdu->max_pdu = 16; - sta->ht_cap.ht_supported = true; - sta->ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_64K; - sta->ht_cap.ampdu_density = AMPDU_DEF_MPDU_DENSITY; - sta->ht_cap.cap = IEEE80211_HT_CAP_GRN_FLD | - IEEE80211_HT_CAP_SGI_20 | - IEEE80211_HT_CAP_SGI_40 | IEEE80211_HT_CAP_40MHZ_INTOLERANT; - /* * minstrel_ht initiates addBA on our behalf by calling * ieee80211_start_tx_ba_session()