summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-12-11 19:41:56 +0400
committerJohn W. Linville <linville@tuxdriver.com>2013-12-11 19:41:56 +0400
commit33457ff7cdd48c54723ab8c550deec28dd904659 (patch)
treeb22fc8b4782aa958b3d692caaf3daf7d0b580432 /drivers
parent8afdd99a1315e759de04ad6e2344f0c5f17ecb1b (diff)
parentbbf807bc0697e577c137a5fffb30fca7c6a45da1 (diff)
downloadlinux-33457ff7cdd48c54723ab8c550deec28dd904659.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ath/ath9k/xmit.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 09cdbcd09739..b5a19e098f2d 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1276,6 +1276,10 @@ static void ath_tx_fill_desc(struct ath_softc *sc, struct ath_buf *bf,
if (!rts_thresh || (len > rts_thresh))
rts = true;
}
+
+ if (!aggr)
+ len = fi->framelen;
+
ath_buf_set_rate(sc, bf, &info, len, rts);
}