Deleted Added
full compact
dn_sched_prio.c (205417) dn_sched_prio.c (240494)
1/*
2 * Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
3 * 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

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27/*
1/*
2 * Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
3 * 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

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27/*
28 * $FreeBSD: head/sys/netinet/ipfw/dn_sched_prio.c 205417 2010-03-21 16:30:32Z luigi $
28 * $FreeBSD: head/sys/netpfil/ipfw/dn_sched_prio.c 240494 2012-09-14 11:51:49Z glebius $
29 */
30#ifdef _KERNEL
31#include <sys/malloc.h>
32#include <sys/socket.h>
33#include <sys/socketvar.h>
34#include <sys/kernel.h>
35#include <sys/mbuf.h>
36#include <sys/module.h>
37#include <net/if.h> /* IFNAMSIZ */
38#include <netinet/in.h>
39#include <netinet/ip_var.h> /* ipfw_rule_ref */
40#include <netinet/ip_fw.h> /* flow_id */
41#include <netinet/ip_dummynet.h>
29 */
30#ifdef _KERNEL
31#include <sys/malloc.h>
32#include <sys/socket.h>
33#include <sys/socketvar.h>
34#include <sys/kernel.h>
35#include <sys/mbuf.h>
36#include <sys/module.h>
37#include <net/if.h> /* IFNAMSIZ */
38#include <netinet/in.h>
39#include <netinet/ip_var.h> /* ipfw_rule_ref */
40#include <netinet/ip_fw.h> /* flow_id */
41#include <netinet/ip_dummynet.h>
42#include <netinet/ipfw/dn_heap.h>
43#include <netinet/ipfw/ip_dn_private.h>
44#include <netinet/ipfw/dn_sched.h>
42#include <netpfil/ipfw/dn_heap.h>
43#include <netpfil/ipfw/ip_dn_private.h>
44#include <netpfil/ipfw/dn_sched.h>
45#else
46#include <dn_test.h>
47#endif
48
49#define DN_SCHED_PRIO 5 //XXX
50
51#if !defined(_KERNEL) || !defined(__linux__)
52#define test_bit(ix, pData) ((*pData) & (1<<(ix)))

--- 177 unchanged lines hidden ---
45#else
46#include <dn_test.h>
47#endif
48
49#define DN_SCHED_PRIO 5 //XXX
50
51#if !defined(_KERNEL) || !defined(__linux__)
52#define test_bit(ix, pData) ((*pData) & (1<<(ix)))

--- 177 unchanged lines hidden ---