Sat Jul 30 19:06:58 2011 UTC ()

Use new style BPF calls.


(rjs)

diff -r1.9 -r1.10 src/sys/dev/marvell/if_mvgbe.c

--- src/sys/dev/marvell/if_mvgbe.c 2011/07/28 15:36:47	1.9
+++ src/sys/dev/marvell/if_mvgbe.c 2011/07/30 19:06:57	1.10

 @@ -1,41 +1,41 @@
-/*	$NetBSD: if_mvgbe.c,v 1.9 2011/07/28 15:36:47 matt Exp $	*/
+/*	$NetBSD: if_mvgbe.c,v 1.10 2011/07/30 19:06:57 rjs Exp $	*/
 /*
  * Copyright (c) 2007, 2008 KIYOHARA Takashi
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.9 2011/07/28 15:36:47 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mvgbe.c,v 1.10 2011/07/30 19:06:57 rjs Exp $");
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/sockio.h>
 #include <dev/marvell/marvellreg.h>
 @@ -888,28 +888,27 @@ mvgbe_start(struct ifnet *ifp)
 		if (mvgbe_encap(sc, m_head, &idx)) {
 			ifp->if_flags |= IFF_OACTIVE;
 			break;
+		}
 		/* now we are committed to transmit the packet */
 		IFQ_DEQUEUE(&ifp->if_snd, m_head);
 		pkts++;
 		/*
 		 * If there's a BPF listener, bounce a copy of this frame
 		 * to him.
 		 */
-		if (ifp->if_bpf)
+		bpf_mtap(ifp, m_head);
 			bpf_ops->bpf_mtap(ifp->if_bpf, m_head);
+	}
 	if (pkts == 0)
 		return;
 	/* Transmit at Queue 0 */
 	if (idx != sc->sc_cdata.mvgbe_tx_prod) {
 		sc->sc_cdata.mvgbe_tx_prod = idx;
 		MVGBE_WRITE(sc, MVGBE_TQC, MVGBE_TQC_ENQ);
 		/*
 		 * Set a timeout in case the chip goes out to lunch.
 		 */
 		ifp->if_timer = 5;
 @@ -1734,28 +1733,27 @@ sw_csum:
+			}
 			m = m0;
 		} else {
 			m->m_pkthdr.rcvif = ifp;
 			m->m_pkthdr.len = m->m_len = total_len;
+		}
 		/* Skip on first 2byte (HW header) */
 		m_adj(m,  MVGBE_HWHEADER_SIZE);
 		m->m_flags |= M_HASFCS;
 		ifp->if_ipackets++;
-		if (ifp->if_bpf)
+		bpf_mtap(ifp, m);
 			bpf_ops->bpf_mtap(ifp->if_bpf, m);
 		/* pass it on. */
 		(*ifp->if_input)(ifp, m);
+	}
+}
 static void
 mvgbe_txeof(struct mvgbe_softc *sc)
+{
 	struct mvgbe_chain_data *cdata = &sc->sc_cdata;
 	struct mvgbe_tx_desc *cur_tx;
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	struct mvgbe_txmap_entry *entry;