PERFORCE change 142299 for review

[Marko Zec]

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

Change 142299 by zec at zec_tca51 on 2008/05/26 11:30:16

	Back-out vimage-specific bits from the iwi driver and allow it
	to compile properly again.
	
	With the recent VAP changes merged hopefully all the woes of
	bpf handles embedded in device driver private structures should
	be over, so we won't need per-driver specialized from-to-vnet
	reassignment methods.

Affected files ...

.. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#12 edit

Differences ...

==== //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#12 (text+ko) ====

@@ -35,8 +35,6 @@
  * http://www.intel.com/network/connectivity/products/wireless/prowireless_mobile.htm
  */
 
-#include "opt_vimage.h"
-
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/sockio.h>
@@ -57,7 +55,6 @@
 #include <sys/firmware.h>
 #include <sys/kthread.h>
 #include <sys/taskqueue.h>
-#include <sys/vimage.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
@@ -211,9 +208,6 @@
 static void	iwi_sysctlattach(struct iwi_softc *);
 static void	iwi_led_event(struct iwi_softc *, int);
 static void	iwi_ledattach(struct iwi_softc *);
-#ifdef VIMAGE
-static void	iwi_reassign(struct ifnet *, struct vnet *, char *);
-#endif
 
 static int iwi_probe(device_t);
 static int iwi_attach(device_t);
@@ -426,9 +420,6 @@
 
 	ieee80211_ifattach(ic);
 	/* override default methods */
-#ifdef VIMAGE
-	ifp->if_reassign = iwi_reassign;
-#endif
 	ic->ic_node_alloc = iwi_node_alloc;
 	sc->sc_node_free = ic->ic_node_free;
 	ic->ic_node_free = iwi_node_free;
@@ -569,28 +560,6 @@
 	return vap;
 }
 
-#ifdef VIMAGE
-static void
-iwi_reassign(struct ifnet *ifp, struct vnet *vnet, char *dname)
-{
-	struct iwi_softc *sc = ifp->if_softc;
-	struct ieee80211com *ic = &sc->sc_ic;
-	IWI_LOCK_DECL;
-	
-	IWI_LOCK(sc);
-	bpfdetach(ifp);
-	sc->sc_drvbpf = NULL;
-	ieee80211_reassign(ic, vnet, dname);
-
-        CURVNET_SET_QUIET(vnet);
-	bpfattach2(ifp, DLT_IEEE802_11_RADIO,
-	    sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap),
-	    &sc->sc_drvbpf);
-        CURVNET_RESTORE();
-	IWI_UNLOCK(sc);
-}
-#endif
-
 static void
 iwi_vap_delete(struct ieee80211vap *vap)
 {