PERFORCE change 134261 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=134261

Change 134261 by sam at sam_ebb on 2008/01/28 00:08:13

	rt2560_reset is wrong; channel changes happen through a different
	callback and returning ENETRESET when we cannot handle the request
	is wrong and screws up ioctls

Affected files ...

.. //depot/projects/vap/sys/dev/ral/rt2560.c#8 edit

Differences ...

==== //depot/projects/vap/sys/dev/ral/rt2560.c#8 (text) ====

@@ -132,7 +132,6 @@
 			    struct ieee80211_node *);
 static void		rt2560_start(struct ifnet *);
 static void		rt2560_watchdog(void *);
-static int		rt2560_reset(struct ieee80211vap *);
 static int		rt2560_ioctl(struct ifnet *, u_long, caddr_t);
 static void		rt2560_bbp_write(struct rt2560_softc *, uint8_t,
 			    uint8_t);
@@ -387,7 +386,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 = rt2560_reset;
 
 	/* override state transition machine */
 	rvp->ral_newstate = vap->iv_newstate;
@@ -2066,25 +2064,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
-rt2560_reset(struct ieee80211vap *vap)
-{
-	struct ieee80211com *ic = vap->iv_ic;
-	struct rt2560_softc *sc = ic->ic_ifp->if_softc;
-
-	if (vap->iv_opmode != IEEE80211_M_MONITOR)
-		return ENETRESET;
-
-	rt2560_set_chan(sc, ic->ic_curchan);
-
-	return 0;
-}
-
 static int
 rt2560_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {