From owner-p4-projects@FreeBSD.ORG Thu Jan 4 06:12:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9A9316A416; Thu, 4 Jan 2007 06:12:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 585F916A407 for ; Thu, 4 Jan 2007 06:12:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 31B5B13C457 for ; Thu, 4 Jan 2007 06:12:26 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l046CQcC090832 for ; Thu, 4 Jan 2007 06:12:26 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l046CPNZ090817 for perforce@freebsd.org; Thu, 4 Jan 2007 06:12:25 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 4 Jan 2007 06:12:25 GMT Message-Id: <200701040612.l046CPNZ090817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 112464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jan 2007 06:12:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=112464 Change 112464 by kmacy@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 *);