diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/rt2860.c | 7 | ||||
| -rw-r--r-- | sys/dev/ic/rt2860reg.h | 26 | ||||
| -rw-r--r-- | sys/dev/ic/rt2860var.h | 3 | ||||
| -rw-r--r-- | sys/dev/usb/if_run.c | 7 | ||||
| -rw-r--r-- | sys/dev/usb/if_runvar.h | 3 |
5 files changed, 19 insertions, 27 deletions
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c index 00e54f0bc56..479d7869a3f 100644 --- a/sys/dev/ic/rt2860.c +++ b/sys/dev/ic/rt2860.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860.c,v 1.40 2010/02/08 18:26:31 damien Exp $ */ +/* $OpenBSD: rt2860.c,v 1.41 2010/02/08 18:46:47 damien Exp $ */ /*- * Copyright (c) 2007, 2008 @@ -1437,7 +1437,7 @@ rt2860_tx(struct rt2860_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); } #ifndef IEEE80211_STA_ONLY /* ask MAC to insert timestamp into probe responses */ @@ -2023,9 +2023,6 @@ rt2860_set_chan(struct rt2860_softc *sc, struct ieee80211_channel *c) rt2860_rf_write(sc, RT2860_RF3, r3); rt2860_rf_write(sc, RT2860_RF4, r4); - /* 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/ic/rt2860reg.h b/sys/dev/ic/rt2860reg.h index bf1e386e428..1ee7f61180f 100644 --- a/sys/dev/ic/rt2860reg.h +++ b/sys/dev/ic/rt2860reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860reg.h,v 1.25 2010/02/08 18:26:31 damien Exp $ */ +/* $OpenBSD: rt2860reg.h,v 1.26 2010/02/08 18:46:47 damien Exp $ */ /*- * Copyright (c) 2007 @@ -897,18 +897,18 @@ static const struct rt2860_rate { uint16_t sp_ack_dur; uint16_t lp_ack_dur; } rt2860_rates[] = { - { 2, 0, IEEE80211_T_DS, 0, 304, 304 }, - { 4, 1, IEEE80211_T_DS, 1, 248, 152 }, - { 11, 2, IEEE80211_T_DS, 2, 213, 117 }, - { 22, 3, IEEE80211_T_DS, 3, 203, 107 }, - { 12, 0, IEEE80211_T_OFDM, 4, 50, 50 }, - { 18, 1, IEEE80211_T_OFDM, 4, 42, 42 }, - { 24, 2, IEEE80211_T_OFDM, 6, 38, 38 }, - { 36, 3, IEEE80211_T_OFDM, 6, 34, 34 }, - { 48, 4, IEEE80211_T_OFDM, 8, 34, 34 }, - { 72, 5, IEEE80211_T_OFDM, 8, 30, 30 }, - { 96, 6, IEEE80211_T_OFDM, 8, 30, 30 }, - { 108, 7, IEEE80211_T_OFDM, 8, 30, 30 } + { 2, 0, IEEE80211_T_DS, 0, 314, 314 }, + { 4, 1, IEEE80211_T_DS, 1, 258, 162 }, + { 11, 2, IEEE80211_T_DS, 2, 223, 127 }, + { 22, 3, IEEE80211_T_DS, 3, 213, 117 }, + { 12, 0, IEEE80211_T_OFDM, 4, 60, 60 }, + { 18, 1, IEEE80211_T_OFDM, 4, 52, 52 }, + { 24, 2, IEEE80211_T_OFDM, 6, 48, 48 }, + { 36, 3, IEEE80211_T_OFDM, 6, 44, 44 }, + { 48, 4, IEEE80211_T_OFDM, 8, 44, 44 }, + { 72, 5, IEEE80211_T_OFDM, 8, 40, 40 }, + { 96, 6, IEEE80211_T_OFDM, 8, 40, 40 }, + { 108, 7, IEEE80211_T_OFDM, 8, 40, 40 } }; /* diff --git a/sys/dev/ic/rt2860var.h b/sys/dev/ic/rt2860var.h index e9a899a5707..de22fb9b5db 100644 --- a/sys/dev/ic/rt2860var.h +++ b/sys/dev/ic/rt2860var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rt2860var.h,v 1.13 2010/02/07 09:14:55 damien Exp $ */ +/* $OpenBSD: rt2860var.h,v 1.14 2010/02/08 18:46:47 damien Exp $ */ /*- * Copyright (c) 2007 @@ -136,7 +136,6 @@ struct rt2860_softc { int sc_tx_timer; int mgtqid; - int sifs; uint8_t qfullmsk; uint32_t mac_rev; 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 |