diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2006-07-18 21:24:41 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2006-07-18 21:24:41 +0000 |
| commit | 7465d774c84cda918cfd46bfc51b9cafc472ad74 (patch) | |
| tree | b8783cf70ddfde3e3a7781042ba2fc87d4135f82 /sys/dev | |
| parent | 0e56107b0589ad001dc67cbd4883bedc8bc76652 (diff) | |
nuke sc->rssadapt_ch. it was used but not initialized.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/if_rum.c | 9 | ||||
| -rw-r--r-- | sys/dev/usb/if_rumvar.h | 3 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index d0492e26237..01c340ad246 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.13 2006/07/18 21:13:33 damien Exp $ */ +/* $OpenBSD: if_rum.c,v 1.14 2006/07/18 21:24:40 damien Exp $ */ /*- * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr> * Copyright (c) 2006 Niall O'Higgins <niallo@openbsd.org> @@ -55,7 +55,6 @@ #include <netinet/ip.h> #include <net80211/ieee80211_var.h> -#include <net80211/ieee80211_rssadapt.h> #include <net80211/ieee80211_radiotap.h> #include <dev/usb/usb.h> @@ -592,8 +591,6 @@ rum_task(void *arg) switch (sc->sc_state) { case IEEE80211_S_INIT: - timeout_del(&sc->rssadapt_ch); - if (ostate == IEEE80211_S_RUN) { /* abort TSF synchronization */ tmp = rum_read(sc, RT2573_TXRX_CSR9); @@ -633,10 +630,8 @@ rum_task(void *arg) /* make tx led blink on tx (controlled by ASIC) */ rum_led_write(sc, RT2573_LED_RADIO|RT2573_LED_A|RT2573_LED_G, 1); - if (ic->ic_opmode != IEEE80211_M_MONITOR) { - timeout_add(&sc->rssadapt_ch, hz / 10); + if (ic->ic_opmode != IEEE80211_M_MONITOR) rum_enable_tsf_sync(sc); - } break; } diff --git a/sys/dev/usb/if_rumvar.h b/sys/dev/usb/if_rumvar.h index 06303d31c3d..9d3e994c9e9 100644 --- a/sys/dev/usb/if_rumvar.h +++ b/sys/dev/usb/if_rumvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rumvar.h,v 1.1 2006/06/16 22:30:46 niallo Exp $ */ +/* $OpenBSD: if_rumvar.h,v 1.2 2006/07/18 21:24:40 damien Exp $ */ /*- * Copyright (c) 2005, 2006 Damien Bergamini <damien.bergamini@free.fr> * Copyright (c) 2006 Niall O'Higgins <niallo@openbsd.org> @@ -154,7 +154,6 @@ struct rum_softc { } sc_txtapu; #define sc_txtap sc_txtapu.th int sc_txtap_len; - struct timeout rssadapt_ch; #endif }; |