From owner-svn-src-projects@FreeBSD.ORG  Sat Jan 10 00:17:03 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC08A106566B;
	Sat, 10 Jan 2009 00:17:03 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AB9B18FC08;
	Sat, 10 Jan 2009 00:17:03 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0A0H3NS073275;
	Sat, 10 Jan 2009 00:17:03 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0A0H31C073274;
	Sat, 10 Jan 2009 00:17:03 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200901100017.n0A0H31C073274@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sat, 10 Jan 2009 00:17:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186987 - projects/vap7/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2009 00:17:04 -0000

Author: sam
Date: Sat Jan 10 00:17:03 2009
New Revision: 186987
URL: http://svn.freebsd.org/changeset/base/186987

Log:
  revert vimage support brought in by merge

Modified:
  projects/vap7/sys/net80211/ieee80211_ddb.c

Modified: projects/vap7/sys/net80211/ieee80211_ddb.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_ddb.c	Fri Jan  9 23:57:59 2009	(r186986)
+++ projects/vap7/sys/net80211/ieee80211_ddb.c	Sat Jan 10 00:17:03 2009	(r186987)
@@ -37,14 +37,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h> 
 #include <sys/kernel.h>
 #include <sys/socket.h>
-#include <sys/vimage.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/ethernet.h>
-#include <net/vnet.h>
 
 #include <net80211/ieee80211_var.h>
 
@@ -191,7 +189,6 @@ DB_SHOW_COMMAND(com, db_show_com)
 
 DB_SHOW_ALL_COMMAND(vaps, db_show_all_vaps)
 {
-	VNET_ITERATOR_DECL(vnet_iter);
 	const struct ifnet *ifp;
 	int i, showall = 0;
 
@@ -202,25 +199,22 @@ DB_SHOW_ALL_COMMAND(vaps, db_show_all_va
 			break;
 		}
 
-	VNET_FOREACH(vnet_iter) {
-		INIT_VNET_NET(vnet_iter);
-		TAILQ_FOREACH(ifp, &V_ifnet, if_list)
-			if (ifp->if_type == IFT_IEEE80211) {
-				const struct ieee80211com *ic = ifp->if_l2com;
-
-				if (!showall) {
-					const struct ieee80211vap *vap;
-					db_printf("%s: com %p vaps:",
-					    ifp->if_xname, ic);
-					TAILQ_FOREACH(vap, &ic->ic_vaps,
-					    iv_next)
-						db_printf(" %s(%p)",
-						    vap->iv_ifp->if_xname, vap);
-					db_printf("\n");
-				} else
-					_db_show_com(ic, 1, 1, 1);
-			}
-	}
+	TAILQ_FOREACH(ifp, &ifnet, if_list)
+		if (ifp->if_type == IFT_IEEE80211) {
+			const struct ieee80211com *ic = ifp->if_l2com;
+
+			if (!showall) {
+				const struct ieee80211vap *vap;
+				db_printf("%s: com %p vaps:",
+				    ifp->if_xname, ic);
+				TAILQ_FOREACH(vap, &ic->ic_vaps,
+				    iv_next)
+					db_printf(" %s(%p)",
+					    vap->iv_ifp->if_xname, vap);
+				db_printf("\n");
+			} else
+				_db_show_com(ic, 1, 1, 1);
+		}
 }
 
 static void