From owner-p4-projects@FreeBSD.ORG Mon May 26 11:30:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD95D106567A; Mon, 26 May 2008 11:30:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FC9B1065678 for ; Mon, 26 May 2008 11:30:41 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6D5B38FC1D for ; Mon, 26 May 2008 11:30:41 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4QBUfWS023971 for ; Mon, 26 May 2008 11:30:41 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4QBUfrw023969 for perforce@freebsd.org; Mon, 26 May 2008 11:30:41 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 26 May 2008 11:30:41 GMT Message-Id: <200805261130.m4QBUfrw023969@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 142299 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: Mon, 26 May 2008 11:30:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=142299 Change 142299 by zec@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 #include #include @@ -57,7 +55,6 @@ #include #include #include -#include #include #include @@ -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) {