Date: Tue, 19 Feb 2008 00:41:15 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 135691 for review Message-ID: <200802190041.m1J0fF1f008498@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=135691 Change 135691 by sam@sam_ebb on 2008/02/19 00:40:15 purge driver reset methods that tried to handle channel change specially for monitor mode; this has been pointless for a long time as channel changes are done entirely through the ic_set_channel callback Affected files ... .. //depot/projects/vap/sys/dev/ral/rt2661.c#10 edit .. //depot/projects/vap/sys/dev/usb/if_ural.c#8 edit Differences ... ==== //depot/projects/vap/sys/dev/ral/rt2661.c#10 (text) ==== @@ -133,7 +133,6 @@ static int rt2661_raw_xmit(struct ieee80211_node *, struct mbuf *, const struct ieee80211_bpf_params *); static void rt2661_watchdog(void *); -static int rt2661_reset(struct ieee80211vap *); static int rt2661_ioctl(struct ifnet *, u_long, caddr_t); static void rt2661_bbp_write(struct rt2661_softc *, uint8_t, uint8_t); @@ -416,7 +415,6 @@ /* enable s/w bmiss handling for sta mode */ ieee80211_vap_setup(ic, vap, name, unit, opmode, flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); - vap->iv_reset = rt2661_reset; /* override state transition machine */ rvp->ral_newstate = vap->iv_newstate; @@ -1900,25 +1898,6 @@ } } -/* - * This function allows for fast channel switching in monitor mode (used by - * net-mgmt/kismet). In IBSS mode, we must explicitly reset the interface to - * generate a new beacon frame. - */ -static int -rt2661_reset(struct ieee80211vap *vap) -{ - struct ieee80211com *ic = vap->iv_ic; - struct rt2661_softc *sc = ic->ic_ifp->if_softc; - - if (vap->iv_opmode != IEEE80211_M_MONITOR) - return ENETRESET; - - rt2661_set_chan(sc, ic->ic_curchan); - - return 0; -} - static int rt2661_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { ==== //depot/projects/vap/sys/dev/usb/if_ural.c#8 (text+ko) ==== @@ -146,7 +146,6 @@ struct ieee80211_node *); static void ural_start(struct ifnet *); static void ural_watchdog(void *); -static int ural_reset(struct ieee80211vap *); static int ural_ioctl(struct ifnet *, u_long, caddr_t); static void ural_set_testmode(struct ural_softc *); static void ural_eeprom_read(struct ural_softc *, uint16_t, void *, @@ -585,7 +584,6 @@ ieee80211_vap_setup(ic, vap, name, unit, opmode, flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); - vap->iv_reset = ural_reset; /* override state transition machine */ uvp->newstate = vap->iv_newstate; vap->iv_newstate = ural_newstate; @@ -1531,25 +1529,6 @@ RAL_UNLOCK(sc); } -/* - * This function allows for fast channel switching in monitor mode (used by - * net-mgmt/kismet). In IBSS mode, we must explicitly reset the interface to - * generate a new beacon frame. - */ -static int -ural_reset(struct ieee80211vap *vap) -{ - struct ieee80211com *ic = vap->iv_ic; - struct ural_softc *sc = ic->ic_ifp->if_softc; - - if (vap->iv_opmode != IEEE80211_M_MONITOR) - return ENETRESET; - - ural_set_chan(sc, ic->ic_curchan); - - return 0; -} - static int ural_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802190041.m1J0fF1f008498>