diff options
| author | Helmut Schaa <helmut.schaa@googlemail.com> | 2011-03-04 13:31:31 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-03-04 14:06:50 -0500 |
| commit | 9d468d2269b64222a706f52b965998ee64d0b4bf (patch) | |
| tree | 5acfa25eddc358909630a96879ca60bf6b17acaf | |
| parent | db7889cda3571bfd0d3a3fc79ca0cd16bb321ff2 (diff) | |
| download | linux-stable-9d468d2269b64222a706f52b965998ee64d0b4bf.tar.gz linux-stable-9d468d2269b64222a706f52b965998ee64d0b4bf.tar.bz2 linux-stable-9d468d2269b64222a706f52b965998ee64d0b4bf.zip | |
mac80211: Remove redundant preamble and RTS flag setup in minstrel_ht
mac80211 does the same afterwards anyway. Hence, just drop
this redundant code.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 165a4518bb48..775cf155e94b 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -519,9 +519,7 @@ minstrel_ht_set_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi, rate->count = mr->retry_count; rate->flags = IEEE80211_TX_RC_MCS | group->flags; - if (txrc->short_preamble) - rate->flags |= IEEE80211_TX_RC_USE_SHORT_PREAMBLE; - if (txrc->rts || rtscts) + if (rtscts) rate->flags |= IEEE80211_TX_RC_USE_RTS_CTS; rate->idx = index % MCS_GROUP_RATES + (group->streams - 1) * MCS_GROUP_RATES; } |