diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2010-02-08 18:46:48 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2010-02-08 18:46:48 +0000 |
| commit | 36161c23202d448725155739edbf9791ab691374 (patch) | |
| tree | 32850d71e8b72877e3725305eeca980b874dc77e /sys/dev/usb | |
| parent | 2b83272e857fabc8e9373da7599767a5dbc87cb8 (diff) | |
add the 10us sifs directly to the pre-computed ack durations.
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/if_run.c | 7 | ||||
| -rw-r--r-- | sys/dev/usb/if_runvar.h | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c index 0c9de76f815..797a7af28df 100644 --- a/sys/dev/usb/if_run.c +++ b/sys/dev/usb/if_run.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_run.c,v 1.53 2010/02/08 18:44:13 damien Exp $ */ +/* $OpenBSD: if_run.c,v 1.54 2010/02/08 18:46:47 damien Exp $ */ /*- * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -2128,7 +2128,7 @@ run_tx(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni) dur = rt2860_rates[ctl_ridx].sp_ack_dur; else dur = rt2860_rates[ctl_ridx].lp_ack_dur; - *(uint16_t *)wh->i_dur = htole16(dur + sc->sifs); + *(uint16_t *)wh->i_dur = htole16(dur); } #if NBPFILTER > 0 @@ -2703,9 +2703,6 @@ run_set_chan(struct run_softc *sc, struct ieee80211_channel *c) else run_rt2870_set_chan(sc, chan); - /* 802.11a uses a 16 microseconds short interframe space */ - sc->sifs = IEEE80211_IS_CHAN_5GHZ(c) ? 16 : 10; - /* determine channel group */ if (chan <= 14) group = 0; diff --git a/sys/dev/usb/if_runvar.h b/sys/dev/usb/if_runvar.h index 0a4af878b3a..29ab534f5e2 100644 --- a/sys/dev/usb/if_runvar.h +++ b/sys/dev/usb/if_runvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_runvar.h,v 1.7 2010/02/07 11:02:24 damien Exp $ */ +/* $OpenBSD: if_runvar.h,v 1.8 2010/02/08 18:46:47 damien Exp $ */ /*- * Copyright (c) 2008,2009 Damien Bergamini <damien.bergamini@free.fr> @@ -190,7 +190,6 @@ struct run_softc { struct run_tx_ring txq[4]; struct run_host_cmd_ring cmdq; uint8_t qfullmsk; - int sifs; int sc_tx_timer; #if NBPFILTER > 0 |