From owner-p4-projects@FreeBSD.ORG  Tue Jan 15 23:19:17 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3E36E16A421; Tue, 15 Jan 2008 23:19:17 +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 0340016A41B
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 23:19:17 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E2C2D13C43E
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 23:19:16 +0000 (UTC)
	(envelope-from sam@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 m0FNJGrO093576
	for <perforce@freebsd.org>; Tue, 15 Jan 2008 23:19:16 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0FNJGIa093573
	for perforce@freebsd.org; Tue, 15 Jan 2008 23:19:16 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 15 Jan 2008 23:19:16 GMT
Message-Id: <200801152319.m0FNJGIa093573@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 133366 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 15 Jan 2008 23:19:17 -0000

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

Change 133366 by sam@sam_ebb on 2008/01/15 23:19:08

	don't see a reason to hookup ether stuff for the device; doing
	it caused the ifnet mutex's to get double-initialized anyway

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211.c#21 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211.c#21 (text+ko) ====

@@ -192,8 +192,6 @@
 	struct sockaddr_dl *sdl;
 	struct ifaddr *ifa;
 
-	ether_ifattach(ifp, ic->ic_myaddr);
-
 	IEEE80211_LOCK_INIT(ic, "ieee80211com");
 	TAILQ_INIT(&ic->ic_vaps);
 	/*
@@ -225,15 +223,15 @@
 	ifp->if_addrlen = IEEE80211_ADDR_LEN;
 	ifp->if_hdrlen = 0;
 	if_attach(ifp);
-	/* NB: must do after 'cuz if_attach resets state */
 	ifp->if_mtu = IEEE80211_MTU_MAX;
+	ifp->if_broadcastaddr = ieee80211broadcastaddr;
+
 	ifa = ifaddr_byindex(ifp->if_index);
 	KASSERT(ifa != NULL, ("%s: no lladdr!\n", __func__));
 	sdl = (struct sockaddr_dl *)ifa->ifa_addr;
 	sdl->sdl_type = IFT_ETHER;		/* XXX IFT_IEEE80211? */
 	sdl->sdl_alen = IEEE80211_ADDR_LEN;
 	IEEE80211_ADDR_COPY(LLADDR(sdl), ic->ic_myaddr);
-	ifp->if_broadcastaddr = ieee80211broadcastaddr;
 }
 
 /*
@@ -263,9 +261,6 @@
 	ieee80211_node_detach(ic);
 	ifmedia_removeall(&ic->ic_media);
 
-	bpfdetach(ifp);
-	ether_ifdetach(ifp);
-
 	IEEE80211_LOCK_DESTROY(ic);
 	if_detach(ifp);
 }