Module Name: src
Committed By: martin
Date: Sun Apr 26 09:03:12 UTC 2015
Modified Files:
src/sys/dev/pci [netbsd-5]: if_wm.c
Log Message:
Apply patch, requested by msaitoh in ticket #1961:
sys/dev/pci/if_wm.c: (patch)
Fix a bug (in the backport for #1850) that passed the wrong pointer as the
first argument of bpf_mtap() on 82575 and newer chip.
To generate a diff of this commit:
cvs rdiff -u -r1.162.4.19 -r1.162.4.20 src/sys/dev/pci/if_wm.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/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.162.4.19 src/sys/dev/pci/if_wm.c:1.162.4.20
--- src/sys/dev/pci/if_wm.c:1.162.4.19 Sat Sep 7 17:10:18 2013
+++ src/sys/dev/pci/if_wm.c Sun Apr 26 09:03:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.162.4.19 2013/09/07 17:10:18 bouyer Exp $ */
+/* $NetBSD: if_wm.c,v 1.162.4.20 2015/04/26 09:03:12 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.162.4.19 2013/09/07 17:10:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.162.4.20 2015/04/26 09:03:12 martin Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -3304,7 +3304,7 @@ wm_nq_start(struct ifnet *ifp)
#if NBPFILTER > 0
/* Pass the packet to any BPF listeners. */
if (ifp->if_bpf)
- bpf_mtap(ifp, m0);
+ bpf_mtap(ifp->if_bpf, m0);
#endif
}
