Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0977e2b authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 8afdd99a 33457ff7

drivers/net/wireless/ath/ath9k/xmit.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

		}