Deleted Added
full compact
if_var.h (203834) if_var.h (205197)
1/*-
2 * Copyright (c) 1982, 1986, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * From: @(#)if.h 8.1 (Berkeley) 6/10/93
1/*-
2 * Copyright (c) 1982, 1986, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * From: @(#)if.h 8.1 (Berkeley) 6/10/93
30 * $FreeBSD: head/sys/net/if_var.h 203834 2010-02-13 16:04:58Z mlaier $
30 * $FreeBSD: head/sys/net/if_var.h 205197 2010-03-15 21:15:03Z mlaier $
31 */
32
33#ifndef _NET_IF_VAR_H_
34#define _NET_IF_VAR_H_
35
36/*
37 * Structures defining a network interface, providing a packet
38 * transport mechanism (ala level 0 of the PUP protocols).

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

640#ifdef ALTQ
641 if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
642 IFQ_LOCK(&ifp->if_snd);
643 IFQ_POLL_NOLOCK(&ifp->if_snd, m);
644 if (m != NULL && func(m, arg) == 0) {
645 IFQ_UNLOCK(&ifp->if_snd);
646 return (NULL);
647 }
31 */
32
33#ifndef _NET_IF_VAR_H_
34#define _NET_IF_VAR_H_
35
36/*
37 * Structures defining a network interface, providing a packet
38 * transport mechanism (ala level 0 of the PUP protocols).

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

640#ifdef ALTQ
641 if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
642 IFQ_LOCK(&ifp->if_snd);
643 IFQ_POLL_NOLOCK(&ifp->if_snd, m);
644 if (m != NULL && func(m, arg) == 0) {
645 IFQ_UNLOCK(&ifp->if_snd);
646 return (NULL);
647 }
648 IFQ_DEQUEUE(&ifp->if_snd, m);
648 IFQ_DEQUEUE_NOLOCK(&ifp->if_snd, m);
649 IFQ_UNLOCK(&ifp->if_snd);
650 return (m);
651 }
652#endif
653 m = buf_ring_peek(br);
654 if (m == NULL || func(m, arg) == 0)
655 return (NULL);
656

--- 246 unchanged lines hidden ---
649 IFQ_UNLOCK(&ifp->if_snd);
650 return (m);
651 }
652#endif
653 m = buf_ring_peek(br);
654 if (m == NULL || func(m, arg) == 0)
655 return (NULL);
656

--- 246 unchanged lines hidden ---