diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-11 16:41:56 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-11 16:41:56 +0100 |
| commit | 33457ff7cdd48c54723ab8c550deec28dd904659 (patch) | |
| tree | b22fc8b4782aa958b3d692caaf3daf7d0b580432 /drivers/net | |
| parent | udp: ipv4: fix an use after free in __udp4_lib_rcv() (diff) | |
| parent | ath9k: fix duration calculation for non-aggregated packets (diff) | |
| download | linux-33457ff7cdd48c54723ab8c550deec28dd904659.tar.xz linux-33457ff7cdd48c54723ab8c550deec28dd904659.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 4 |
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); } |