Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/gemini Pass correct pointer to bpf_mtap() and m...



details:   https://anonhg.NetBSD.org/src/rev/3bb85e4f1dd7
branches:  trunk
changeset: 750910:3bb85e4f1dd7
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Jan 18 18:23:53 2010 +0000

description:
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(?)

diffstat:

 sys/arch/arm/gemini/gemini_gmac.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r f472e5367c36 -r 3bb85e4f1dd7 sys/arch/arm/gemini/gemini_gmac.c
--- a/sys/arch/arm/gemini/gemini_gmac.c Mon Jan 18 18:14:43 2010 +0000
+++ b/sys/arch/arm/gemini/gemini_gmac.c Mon Jan 18 18:23:53 2010 +0000
@@ -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;



Home | Main Index | Thread Index | Old Index