| Message ID | 20131211154810.GB7411@tuxdriver.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: "John W. Linville" <linville@tuxdriver.com> Date: Wed, 11 Dec 2013 10:48:10 -0500 > 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. Pulled, thanks John. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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); }
Dave, 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! Thanks, John --- The following changes since commit 8afdd99a1315e759de04ad6e2344f0c5f17ecb1b: udp: ipv4: fix an use after free in __udp4_lib_rcv() (2013-12-10 22:58:40 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem for you to fetch changes up to 33457ff7cdd48c54723ab8c550deec28dd904659: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem (2013-12-11 10:41:56 -0500) ---------------------------------------------------------------- Felix Fietkau (1): ath9k: fix duration calculation for non-aggregated packets John W. Linville (1): Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem drivers/net/wireless/ath/ath9k/xmit.c | 4 ++++ 1 file changed, 4 insertions(+)