summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-12-11 12:57:57 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-11 12:57:57 -0500
commitd0977e2b85ab7966d1f8cd85a19ac5aa80793638 (patch)
treeb22fc8b4782aa958b3d692caaf3daf7d0b580432
parent8afdd99a1315e759de04ad6e2344f0c5f17ecb1b (diff)
parent33457ff7cdd48c54723ab8c550deec28dd904659 (diff)
downloadblackbird-op-linux-d0977e2b85ab7966d1f8cd85a19ac5aa80793638.tar.gz
blackbird-op-linux-d0977e2b85ab7966d1f8cd85a19ac5aa80793638.zip
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== Just one patch this time -- a fix from Felix Fietkau to fix the duration calculation for non-aggregated packets in ath9k. This is a small change and it is obviously specific to ath9k. Please let me know if there are problems! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
-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);
}
OpenPOWER on IntegriCloud