Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/playstation2/dev Fix bpf_mtap argument
details: https://anonhg.NetBSD.org/src/rev/b6f959e412b0
branches: trunk
changeset: 344525:b6f959e412b0
user: martin <martin%NetBSD.org@localhost>
date: Sun Apr 03 09:58:45 2016 +0000
description:
Fix bpf_mtap argument
diffstat:
sys/arch/playstation2/dev/if_smap.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diffs (78 lines):
diff -r 0dd18704ac7b -r b6f959e412b0 sys/arch/playstation2/dev/if_smap.c
--- a/sys/arch/playstation2/dev/if_smap.c Sun Apr 03 09:57:40 2016 +0000
+++ b/sys/arch/playstation2/dev/if_smap.c Sun Apr 03 09:58:45 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smap.c,v 1.19 2016/02/09 08:32:09 ozaki-r Exp $ */
+/* $NetBSD: if_smap.c,v 1.20 2016/04/03 09:58:45 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,22 +30,21 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.19 2016/02/09 08:32:09 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smap.c,v 1.20 2016/04/03 09:58:45 martin Exp $");
#include "debug_playstation2.h"
#include <sys/param.h>
#include <sys/systm.h>
-
+#include <sys/device.h>
#include <sys/syslog.h>
#include <sys/mbuf.h>
#include <sys/ioctl.h>
+#include <sys/rndsource.h>
#include <sys/socket.h>
#include <playstation2/ee/eevar.h>
-#include <sys/rndsource.h>
-
#include <net/if.h>
#include <net/if_dl.h>
#include <net/if_types.h>
@@ -53,7 +52,6 @@
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
#include <netinet/in.h>
@@ -119,7 +117,7 @@
STATIC int smap_match(struct device *, struct cfdata *, void *);
STATIC void smap_attach(struct device *, struct device *, void *);
-CFATTACH_DECL(smap, sizeof (struct smap_softc),
+CFATTACH_DECL_NEW(smap, sizeof (struct smap_softc),
smap_match, smap_attach, NULL, NULL);
STATIC int smap_intr(void *);
@@ -260,7 +258,6 @@
smap_ioctl(struct ifnet *ifp, u_long command, void *data)
{
struct smap_softc *sc = ifp->if_softc;
- struct ifreq *ifr = (struct ifreq *) data;
int error, s;
s = splnet();
@@ -409,7 +406,7 @@
if (m != NULL) {
if (ifp->if_bpf)
- bpf_mtap(ifp->if_bpf, m);
+ bpf_mtap(ifp, m);
if_percpuq_enqueue(ifp->if_percpuq, m);
}
}
@@ -509,7 +506,7 @@
IFQ_DEQUEUE(&ifp->if_snd, m0);
KDASSERT(m0 != NULL);
if (ifp->if_bpf)
- bpf_mtap(ifp->if_bpf, m0);
+ bpf_mtap(ifp, m0);
p = (u_int8_t *)sc->tx_buf;
q = p + sz;
Home |
Main Index |
Thread Index |
Old Index