| if_pfsync.c (147261) | if_pfsync.c (147321) |
|---|---|
| 1/* $FreeBSD: head/sys/contrib/pf/net/if_pfsync.c 147261 2005-06-10 17:23:49Z mlaier $ */ | 1/* $FreeBSD: head/sys/contrib/pf/net/if_pfsync.c 147321 2005-06-12 16:46:20Z mlaier $ */ |
| 2/* $OpenBSD: if_pfsync.c,v 1.46 2005/02/20 15:58:38 mcbride Exp $ */ 3 4/* 5 * Copyright (c) 2002 Michael Shalayeff 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without 9 * modification, are permitted provided that the following conditions --- 205 unchanged lines hidden (view full) --- 215 ifp->if_ioctl = pfsyncioctl; 216 ifp->if_output = pfsyncoutput; 217 ifp->if_start = pfsyncstart; 218 ifp->if_snd.ifq_maxlen = ifqmaxlen; 219 ifp->if_hdrlen = PFSYNC_HDRLEN; 220 ifp->if_baudrate = IF_Mbps(100); 221 ifp->if_softc = sc; 222 pfsync_setmtu(sc, MCLBYTES); | 2/* $OpenBSD: if_pfsync.c,v 1.46 2005/02/20 15:58:38 mcbride Exp $ */ 3 4/* 5 * Copyright (c) 2002 Michael Shalayeff 6 * All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without 9 * modification, are permitted provided that the following conditions --- 205 unchanged lines hidden (view full) --- 215 ifp->if_ioctl = pfsyncioctl; 216 ifp->if_output = pfsyncoutput; 217 ifp->if_start = pfsyncstart; 218 ifp->if_snd.ifq_maxlen = ifqmaxlen; 219 ifp->if_hdrlen = PFSYNC_HDRLEN; 220 ifp->if_baudrate = IF_Mbps(100); 221 ifp->if_softc = sc; 222 pfsync_setmtu(sc, MCLBYTES); |
| 223 /* 224 * XXX 225 * The 2nd arg. 0 to callout_init(9) shoule be set to CALLOUT_MPSAFE 226 * if Gaint lock is removed from the network stack. 227 */ 228 callout_init(&sc->sc_tmo, 0); 229 callout_init(&sc->sc_bulk_tmo, 0); 230 callout_init(&sc->sc_bulkfail_tmo, 0); 231 callout_init(&sc->sc_send_tmo, 0); | 223 callout_init(&sc->sc_tmo, NET_CALLOUT_MPSAFE); 224 callout_init(&sc->sc_bulk_tmo, NET_CALLOUT_MPSAFE); 225 callout_init(&sc->sc_bulkfail_tmo, NET_CALLOUT_MPSAFE); 226 callout_init(&sc->sc_send_tmo, NET_CALLOUT_MPSAFE); |
| 232 mtx_init(&sc->sc_ifq.ifq_mtx, ifp->if_xname, "pfsync send queue", 233 MTX_DEF); 234 if_attach(ifp); 235 236 LIST_INSERT_HEAD(&pfsync_list, sc, sc_next); 237#if NBPFILTER > 0 238 bpfattach(ifp, DLT_PFSYNC, PFSYNC_HDRLEN); 239#endif --- 1631 unchanged lines hidden --- | 227 mtx_init(&sc->sc_ifq.ifq_mtx, ifp->if_xname, "pfsync send queue", 228 MTX_DEF); 229 if_attach(ifp); 230 231 LIST_INSERT_HEAD(&pfsync_list, sc, sc_next); 232#if NBPFILTER > 0 233 bpfattach(ifp, DLT_PFSYNC, PFSYNC_HDRLEN); 234#endif --- 1631 unchanged lines hidden --- |