Module Name:    src
Committed By:   pooka
Date:           Mon Jan 18 18:23:53 UTC 2010

Modified Files:
        src/sys/arch/arm/gemini: gemini_gmac.c

Log Message:
Pass correct pointer to bpf_mtap() and most likely avoid a crash
if bpf is activated.

not even compile-tested, since i can't find any config in the tree
which uses this(?)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_gmac.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/gemini/gemini_gmac.c
diff -u src/sys/arch/arm/gemini/gemini_gmac.c:1.3 src/sys/arch/arm/gemini/gemini_gmac.c:1.4
--- src/sys/arch/arm/gemini/gemini_gmac.c:1.3	Tue Dec 23 02:15:10 2008
+++ src/sys/arch/arm/gemini/gemini_gmac.c	Mon Jan 18 18:23:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_gmac.c,v 1.3 2008/12/23 02:15:10 matt Exp $ */
+/* $NetBSD: gemini_gmac.c,v 1.4 2010/01/18 18:23:53 pooka Exp $ */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -49,7 +49,7 @@
 
 #include <sys/gpio.h>
 
-__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.3 2008/12/23 02:15:10 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_gmac.c,v 1.4 2010/01/18 18:23:53 pooka Exp $");
 
 #define	SWFREEQ_DESCS	256	/* one page worth */
 #define	HWFREEQ_DESCS	256	/* one page worth */
@@ -550,7 +550,7 @@
 
 #if NBPFILTER > 0
 	if (ifp->if_bpf)
-		bpf_mtap(ifp, m);
+		bpf_mtap(ifp->if_bpf, m);
 #endif
 	m_freem(m);
 }
@@ -860,7 +860,7 @@
 		KASSERT(m_length(m) == m->m_pkthdr.len);
 #if NBPFILTER > 0
 		if (ifp->if_bpf)
-			bpf_mtap(ifp, m);
+			bpf_mtap(ifp->if_bpf, m);
 #endif
 		(*ifp->if_input)(ifp, m);
 		break;

Reply via email to