unbreak LINT building
authorSepherosa Ziehau <sephe@dragonflybsd.org>
Wed, 30 Nov 2005 13:35:24 +0000 (13:35 +0000)
committerSepherosa Ziehau <sephe@dragonflybsd.org>
Wed, 30 Nov 2005 13:35:24 +0000 (13:35 +0000)
sys/contrib/dev/oltr/if_oltr.c
sys/dev/netif/fpa/if_fpa.c
sys/net/if_fddisubr.c
sys/net/if_iso88025subr.c
sys/netproto/atm/atm_if.c

index e8a9e17..61aba18 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/contrib/dev/oltr/if_oltr.c,v 1.11.2.5 2001/10/20 04:15:21 mdodd Exp $
- * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.21 2005/10/12 17:35:49 dillon Exp $
+ * $DragonFly: src/sys/contrib/dev/oltr/Attic/if_oltr.c,v 1.22 2005/11/30 13:35:24 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -416,7 +416,7 @@ oltr_pci_attach(device_t dev)
         * Attach the interface
         */
        ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
-       iso88025_ifattach(ifp);
+       iso88025_ifattach(ifp, NULL);
 
        crit_exit();
        return(0);
index b3dfa76..0e557e2 100644 (file)
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/pdq/if_fpa.c,v 1.13 1999/08/28 00:50:50 peter Exp $
- * $DragonFly: src/sys/dev/netif/fpa/Attic/if_fpa.c,v 1.12 2005/11/28 17:13:42 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/fpa/Attic/if_fpa.c,v 1.13 2005/11/30 13:35:24 sephe Exp $
  */
 
 /*
@@ -199,12 +199,12 @@ pdq_pci_attach(
 }
 
 static void
-pdq_pci_shutdown(
-    void *sc,
-    int howto)
+pdq_pci_shutdown(void *arg, int howto)
 {
+    pdq_softc_t *sc = arg;
+
     lwkt_serialize_enter(sc->sc_if.if_serializer);
-    pdq_hwreset(((pdq_softc_t *)sc)->sc_pdq);
+    pdq_hwreset(sc->sc_pdq);
     lwkt_serialize_exit(sc->sc_if.if_serializer);
 }
 
index 5fa4bd4..af91b9c 100644 (file)
@@ -34,7 +34,7 @@
  *
  *     from: if_ethersubr.c,v 1.5 1994/12/13 22:31:45 wollman Exp
  * $FreeBSD: src/sys/net/if_fddisubr.c,v 1.41.2.8 2002/02/20 23:34:09 fjoe Exp $
- * $DragonFly: src/sys/net/Attic/if_fddisubr.c,v 1.19 2005/11/28 17:13:45 dillon Exp $
+ * $DragonFly: src/sys/net/Attic/if_fddisubr.c,v 1.20 2005/11/30 13:35:24 sephe Exp $
  */
 
 #include "opt_atalk.h"
@@ -437,7 +437,7 @@ fddi_input(struct ifnet *ifp, struct mbuf *m)
                switch (type) {
 #ifdef INET
                case ETHERTYPE_IP:
-                       if (ipflow_fastforward(m))
+                       if (ipflow_fastforward(m, ifp->if_serializer))
                                return;
                        isr = NETISR_IP;
                        break;
index 4fa765a..b0d0323 100644 (file)
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/net/if_iso88025subr.c,v 1.7.2.7 2002/06/18 00:15:31 kbyanc Exp $
- * $DragonFly: src/sys/net/Attic/if_iso88025subr.c,v 1.14 2005/11/28 17:13:45 dillon Exp $
+ * $DragonFly: src/sys/net/Attic/if_iso88025subr.c,v 1.15 2005/11/30 13:35:24 sephe Exp $
  *
  */
 
@@ -402,7 +402,7 @@ iso88025_input(struct ifnet *ifp, struct mbuf *m)
 #ifdef INET
        case ETHERTYPE_IP:
                th->iso88025_shost[0] &= ~(TR_RII);
-               if (ipflow_fastforward(m))
+               if (ipflow_fastforward(m, ifp->if_serializer))
                        return;
                isr = NETISR_IP;
                break;
index 58bea34..112aa80 100644 (file)
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *     @(#) $FreeBSD: src/sys/netatm/atm_if.c,v 1.5 1999/08/28 00:48:35 peter Exp $
- *     @(#) $DragonFly: src/sys/netproto/atm/atm_if.c,v 1.12 2005/11/28 17:13:46 dillon Exp $
+ *     @(#) $DragonFly: src/sys/netproto/atm/atm_if.c,v 1.13 2005/11/30 13:35:24 sephe Exp $
  */
 
 /*
@@ -509,7 +509,7 @@ atm_physif_ioctl(code, data, arg)
                                panic("AIOCF_SETNIF: unknown media");
                        }
 
-                       if ((err = atm_nif_attach(nip)) != 0) {
+                       if ((err = atm_nif_attach(nip, NULL)) != 0) {
                                atm_free ( (caddr_t)nip );
 
                                /*