Date: Mon, 5 Sep 2011 07:36:16 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r225385 - user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample Message-ID: <201109050736.p857aGXY026072@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Mon Sep 5 07:36:16 2011 New Revision: 225385 URL: http://svn.freebsd.org/changeset/base/225385 Log: Fix the ht40/preamble flag, I had those around the wrong way. Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample/sample.h Modified: user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample/sample.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample/sample.h Mon Sep 5 06:54:13 2011 (r225384) +++ user/adrian/if_ath_tx/sys/dev/ath/ath_rate/sample/sample.h Mon Sep 5 07:36:16 2011 (r225385) @@ -198,9 +198,8 @@ static unsigned calc_usecs_unicast_packe if (rts) /* SIFS + CTS */ ctsduration += rt->info[cix].spAckDuration; - /* XXX assumes short preamble */ - /* XXX assumes HT/20; the node info isn't yet available here */ - ctsduration += ath_hal_pkt_txtime(sc->sc_ah, rt, length, rix, 0, is_ht40); + /* XXX no shortgi flag yet? */ + ctsduration += ath_hal_pkt_txtime(sc->sc_ah, rt, length, rix, is_ht40, 0); if (cts) /* SIFS + ACK */ ctsduration += rt->info[cix].spAckDuration; @@ -209,9 +208,8 @@ static unsigned calc_usecs_unicast_packe } tt += t_difs; - /* XXX assumes short preamble */ - /* XXX assumes HT/20; the node info isn't yet available here */ - tt += (long_retries+1)*ath_hal_pkt_txtime(sc->sc_ah, rt, length, rix, 0, is_ht40); + /* XXX no shortgi flag yet? */ + tt += (long_retries+1)*ath_hal_pkt_txtime(sc->sc_ah, rt, length, rix, is_ht40, 0); tt += (long_retries+1)*(t_sifs + rt->info[rix].spAckDuration); for (x = 0; x <= short_retries + long_retries; x++) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109050736.p857aGXY026072>