From 37f01d63df0bacab1df74f5053674c3acd52dd79 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Thu, 18 Feb 2010 11:56:32 +0100 Subject: [PATCH] Use ShortGI only when a peer supports it --- rt2870.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rt2870.c b/rt2870.c index 60c7727..93268b1 100644 --- a/rt2870.c +++ b/rt2870.c @@ -4058,7 +4058,7 @@ static int rt2870_tx_frame(struct rt2870_softc *sc, stbc = (ni->ni_htcap & IEEE80211_HTCAP_RXSTBC) ? 1 : 0; shortgi = (ic->ic_flags_ext & (IEEE80211_FEXT_SHORTGI20 | IEEE80211_FEXT_SHORTGI40)) && - (ni->ni_flags & IEEE80211_NODE_HT); + (ni->ni_flags & IEEE80211_NODE_HT) && (ni->ni_htcap & (IEEE80211_HTCAP_SHORTGI20 | IEEE80211_HTCAP_SHORTGI40)); txwi->phymode_ifs_stbc_shortgi |= ((stbc & RT2870_TXWI_STBC_MASK) << RT2870_TXWI_STBC_SHIFT) | -- 2.11.4.GIT