Module Name: src
Committed By: martin
Date: Sun Apr 3 09:58:45 UTC 2016
Modified Files:
src/sys/arch/playstation2/dev: if_smap.c
Log Message:
Fix bpf_mtap argument
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/playstation2/dev/if_smap.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/playstation2/dev/if_smap.c
diff -u src/sys/arch/playstation2/dev/if_smap.c:1.19 src/sys/arch/playstation2/dev/if_smap.c:1.20
--- src/sys/arch/playstation2/dev/if_smap.c:1.19 Tue Feb 9 08:32:09 2016
+++ src/sys/arch/playstation2/dev/if_smap.c Sun Apr 3 09:58:45 2016
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: if_smap.c,v
#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 @@ struct smap_softc {
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 @@ int
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 @@ smap_rxeof(void *arg)
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 @@ smap_start(struct ifnet *ifp)
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;
