Deleted Added
full compact
if_pfsync.c (164033) if_pfsync.c (165632)
1/* $FreeBSD: head/sys/contrib/pf/net/if_pfsync.c 164033 2006-11-06 13:42:10Z rwatson $ */
1/* $FreeBSD: head/sys/contrib/pf/net/if_pfsync.c 165632 2006-12-29 13:59:50Z jhb $ */
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

--- 1778 unchanged lines hidden (view full) ---

1788 m = sc->sc_mbuf;
1789 sc->sc_mbuf = NULL;
1790 sc->sc_statep.s = NULL;
1791
1792#ifdef __FreeBSD__
1793 KASSERT(m != NULL, ("pfsync_sendout: null mbuf"));
1794#endif
1795#if NBPFILTER > 0
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

--- 1778 unchanged lines hidden (view full) ---

1788 m = sc->sc_mbuf;
1789 sc->sc_mbuf = NULL;
1790 sc->sc_statep.s = NULL;
1791
1792#ifdef __FreeBSD__
1793 KASSERT(m != NULL, ("pfsync_sendout: null mbuf"));
1794#endif
1795#if NBPFILTER > 0
1796#ifdef __FreeBSD__
1797 BPF_MTAP(ifp, m);
1798#else
1796 if (ifp->if_bpf)
1797 bpf_mtap(ifp->if_bpf, m);
1798#endif
1799 if (ifp->if_bpf)
1800 bpf_mtap(ifp->if_bpf, m);
1801#endif
1802#endif
1799
1800 if (sc->sc_mbuf_net) {
1801 m_freem(m);
1802 m = sc->sc_mbuf_net;
1803 sc->sc_mbuf_net = NULL;
1804 sc->sc_statep_net.s = NULL;
1805 }
1806

--- 110 unchanged lines hidden ---
1803
1804 if (sc->sc_mbuf_net) {
1805 m_freem(m);
1806 m = sc->sc_mbuf_net;
1807 sc->sc_mbuf_net = NULL;
1808 sc->sc_statep_net.s = NULL;
1809 }
1810

--- 110 unchanged lines hidden ---