Deleted Added
full compact
dn_sched_wf2q.c (213267) dn_sched_wf2q.c (240494)
1/*
2 * Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
3 * Copyright (c) 2000-2002 Luigi Rizzo, Universita` di Pisa
4 * All rights reserved
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28/*
1/*
2 * Copyright (c) 2010 Riccardo Panicucci, Universita` di Pisa
3 * Copyright (c) 2000-2002 Luigi Rizzo, Universita` di Pisa
4 * All rights reserved
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

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

--- 319 unchanged lines hidden ---
47#else
48#include <dn_test.h>
49#endif
50
51#ifndef MAX64
52#define MAX64(x,y) (( (int64_t) ( (y)-(x) )) > 0 ) ? (y) : (x)
53#endif
54

--- 319 unchanged lines hidden ---