diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2007-06-07 20:20:16 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2007-06-07 20:20:16 +0000 |
| commit | 2151f4451c5f87978d5c21794dc33a45a8b6b11c (patch) | |
| tree | 50d4fb653e63bb21e53567c66208d43fefe67c39 /sys/dev/ic/rtwvar.h | |
| parent | a6375dcfa344ccca09970470724321331cb34fd6 (diff) | |
move ieee80211_compute_duration() and ieee80211_compute_duration1()
functions into the two drivers that use them (atw and rtw.)
this code is not generic enough to be used by other drivers and
there is no chance that it will ever be used in newer driver since
it supports 802.11b only.
plus, it hurts my eyes each time i look into ieee80211_output.c.
"fine with me as long as the logic doesn't change in the functions" jsg@
Diffstat (limited to 'sys/dev/ic/rtwvar.h')
| -rw-r--r-- | sys/dev/ic/rtwvar.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sys/dev/ic/rtwvar.h b/sys/dev/ic/rtwvar.h index e5936aaeabe..fbadf60822f 100644 --- a/sys/dev/ic/rtwvar.h +++ b/sys/dev/ic/rtwvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rtwvar.h,v 1.22 2006/06/27 04:25:12 jsg Exp $ */ +/* $OpenBSD: rtwvar.h,v 1.23 2007/06/07 20:20:15 damien Exp $ */ /* $NetBSD: rtwvar.h,v 1.10 2004/12/26 22:37:57 mycroft Exp $ */ /*- @@ -154,6 +154,13 @@ struct rtw_rxsoft { bus_dmamap_t rs_dmamap; }; +struct rtw_duration { + uint16_t d_rts_dur; + uint16_t d_data_dur; + uint16_t d_plcp_len; + uint8_t d_residue; /* unused octets in time slot */ +}; + struct rtw_txsoft { SIMPLEQ_ENTRY(rtw_txsoft) ts_q; struct mbuf *ts_mbuf; @@ -161,8 +168,8 @@ struct rtw_txsoft { struct ieee80211_node *ts_ni; /* destination node */ u_int ts_first; /* 1st hw descriptor */ u_int ts_last; /* last hw descriptor */ - struct ieee80211_duration ts_d0; - struct ieee80211_duration ts_dn; + struct rtw_duration ts_d0; + struct rtw_duration ts_dn; }; #define RTW_NTXPRI 4 /* number of Tx priorities */ |