diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-23 11:47:48 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-23 11:47:48 -0400 |
| commit | 81ca2ff9450c2e983ee416eca17ebe6fa9c3da4f (patch) | |
| tree | 6e21a27d727481434b58543d8cff960bb7672b53 /net/mac80211/rc80211_minstrel_ht.c | |
| parent | 4a5a8aa6c966eafc106543bd955ae388230420e5 (diff) | |
| parent | 19c361608ce3e73f352e323262f7e0a8264be3af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/rc80211_minstrel_ht.c')
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index f5aed963b22..f3bbea1eb9e 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -828,6 +828,9 @@ minstrel_ht_update_cck(struct minstrel_priv *mp, struct minstrel_ht_sta *mi, if (sband->band != IEEE80211_BAND_2GHZ) return; + if (!(mp->hw->flags & IEEE80211_HW_SUPPORTS_HT_CCK_RATES)) + return; + mi->cck_supported = 0; mi->cck_supported_short = 0; for (i = 0; i < 4; i++) { |