PERFORCE change 112464 for review
Kip Macy
kmacy at FreeBSD.org
Wed Jan 3 22:12:26 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=112464
Change 112464 by kmacy at kmacy_serendipity:sam_wifi on 2007/01/04 06:12:00
we no longer need to explicitly set the channel when transitioning
to a new state
rt2560_shutdown and rt2560_suspend just call rt2560_stop - have the
ops vector call rt2560_stop instead
Affected files ...
.. //depot/projects/wifi/sys/dev/ral/if_ral_pci.c#4 edit
.. //depot/projects/wifi/sys/dev/ral/rt2560.c#7 edit
.. //depot/projects/wifi/sys/dev/ral/rt2560var.h#4 edit
Differences ...
==== //depot/projects/wifi/sys/dev/ral/if_ral_pci.c#4 (text+ko) ====
@@ -87,8 +87,8 @@
} ral_rt2560_opns = {
rt2560_attach,
rt2560_detach,
- rt2560_shutdown,
- rt2560_suspend,
+ rt2560_stop,
+ rt2560_stop,
rt2560_resume,
rt2560_intr
==== //depot/projects/wifi/sys/dev/ral/rt2560.c#7 (text) ====
@@ -151,7 +151,6 @@
static void rt2560_set_txantenna(struct rt2560_softc *, int);
static void rt2560_set_rxantenna(struct rt2560_softc *, int);
static void rt2560_init(void *);
-static void rt2560_stop(void *);
static int rt2560_raw_xmit(struct ieee80211_node *, struct mbuf *,
const struct ieee80211_bpf_params *);
@@ -372,22 +371,6 @@
}
void
-rt2560_shutdown(void *xsc)
-{
- struct rt2560_softc *sc = xsc;
-
- rt2560_stop(sc);
-}
-
-void
-rt2560_suspend(void *xsc)
-{
- struct rt2560_softc *sc = xsc;
-
- rt2560_stop(sc);
-}
-
-void
rt2560_resume(void *xsc)
{
struct rt2560_softc *sc = xsc;
@@ -778,22 +761,7 @@
rt2560_update_led(sc, 0, 0);
}
break;
-
- case IEEE80211_S_SCAN:
- rt2560_set_chan(sc, ic->ic_curchan);
- break;
-
- case IEEE80211_S_AUTH:
- rt2560_set_chan(sc, ic->ic_curchan);
- break;
-
- case IEEE80211_S_ASSOC:
- rt2560_set_chan(sc, ic->ic_curchan);
- break;
-
case IEEE80211_S_RUN:
- rt2560_set_chan(sc, ic->ic_curchan);
-
ni = ic->ic_bss;
if (ic->ic_opmode != IEEE80211_M_MONITOR) {
@@ -828,6 +796,10 @@
rt2560_enable_tsf_sync(sc);
}
break;
+ case IEEE80211_S_SCAN:
+ case IEEE80211_S_AUTH:
+ case IEEE80211_S_ASSOC:
+ break;
}
return (error != 0) ? error : sc->sc_newstate(ic, nstate, arg);
==== //depot/projects/wifi/sys/dev/ral/rt2560var.h#4 (text) ====
@@ -160,8 +160,7 @@
int rt2560_attach(device_t, int);
int rt2560_detach(void *);
-void rt2560_shutdown(void *);
-void rt2560_suspend(void *);
+void rt2560_stop(void *);
void rt2560_resume(void *);
void rt2560_intr(void *);
More information about the p4-projects
mailing list