From owner-svn-src-all@FreeBSD.ORG  Mon May 25 16:34:35 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 90A8A106564A;
	Mon, 25 May 2009 16:34:35 +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 7F84C8FC12;
	Mon, 25 May 2009 16:34:35 +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 n4PGYZwJ029078;
	Mon, 25 May 2009 16:34:35 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4PGYZC4029076;
	Mon, 25 May 2009 16:34:35 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200905251634.n4PGYZC4029076@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Mon, 25 May 2009 16:34:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192763 - in head/sys: net sys
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 May 2009 16:34:36 -0000

Author: sam
Date: Mon May 25 16:34:35 2009
New Revision: 192763
URL: http://svn.freebsd.org/changeset/base/192763

Log:
  rev bpf attach/detach event api to include the dlt

Modified:
  head/sys/net/bpf.c
  head/sys/sys/eventhandler.h

Modified: head/sys/net/bpf.c
==============================================================================
--- head/sys/net/bpf.c	Mon May 25 15:48:10 2009	(r192762)
+++ head/sys/net/bpf.c	Mon May 25 16:34:35 2009	(r192763)
@@ -535,7 +535,7 @@ bpf_attachd(struct bpf_d *d, struct bpf_
 	bpf_bpfd_cnt++;
 	BPFIF_UNLOCK(bp);
 
-	EVENTHANDLER_INVOKE(bpf_track, bp->bif_ifp, 1);
+	EVENTHANDLER_INVOKE(bpf_track, bp->bif_ifp, bp->bif_dlt, 1);
 }
 
 /*
@@ -563,7 +563,7 @@ bpf_detachd(struct bpf_d *d)
 	BPFD_UNLOCK(d);
 	BPFIF_UNLOCK(bp);
 
-	EVENTHANDLER_INVOKE(bpf_track, ifp, 0);
+	EVENTHANDLER_INVOKE(bpf_track, ifp, bp->bif_dlt, 0);
 
 	/*
 	 * Check if this descriptor had requested promiscuous mode.

Modified: head/sys/sys/eventhandler.h
==============================================================================
--- head/sys/sys/eventhandler.h	Mon May 25 15:48:10 2009	(r192762)
+++ head/sys/sys/eventhandler.h	Mon May 25 16:34:35 2009	(r192763)
@@ -184,7 +184,8 @@ EVENTHANDLER_DECLARE(vlan_unconfig, vlan
 
 /* BPF attach/detach events */
 struct ifnet;
-typedef void (*bpf_track_fn)(void *, struct ifnet *, int /* 1 =>'s attach */);
+typedef void (*bpf_track_fn)(void *, struct ifnet *, int /* dlt */,
+    int /* 1 =>'s attach */);
 EVENTHANDLER_DECLARE(bpf_track, bpf_track_fn);
 
 /*