Deleted Added
full compact
dn_sched_rr.c (225736) dn_sched_rr.c (243401)
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: stable/9/sys/netinet/ipfw/dn_sched_rr.c 206845 2010-04-19 16:17:30Z luigi $
28 * $FreeBSD: stable/9/sys/netpfil/ipfw/dn_sched_rr.c 243401 2012-11-22 12:11:32Z glebius $
29 */
30
31#ifdef _KERNEL
32#include <sys/malloc.h>
33#include <sys/socket.h>
34#include <sys/socketvar.h>
35#include <sys/kernel.h>
36#include <sys/mbuf.h>
37#include <sys/module.h>
38#include <net/if.h> /* IFNAMSIZ */
39#include <netinet/in.h>
40#include <netinet/ip_var.h> /* ipfw_rule_ref */
41#include <netinet/ip_fw.h> /* flow_id */
42#include <netinet/ip_dummynet.h>
29 */
30
31#ifdef _KERNEL
32#include <sys/malloc.h>
33#include <sys/socket.h>
34#include <sys/socketvar.h>
35#include <sys/kernel.h>
36#include <sys/mbuf.h>
37#include <sys/module.h>
38#include <net/if.h> /* IFNAMSIZ */
39#include <netinet/in.h>
40#include <netinet/ip_var.h> /* ipfw_rule_ref */
41#include <netinet/ip_fw.h> /* flow_id */
42#include <netinet/ip_dummynet.h>
43#include <netinet/ipfw/dn_heap.h>
44#include <netinet/ipfw/ip_dn_private.h>
45#include <netinet/ipfw/dn_sched.h>
43#include <netpfil/ipfw/dn_heap.h>
44#include <netpfil/ipfw/ip_dn_private.h>
45#include <netpfil/ipfw/dn_sched.h>
46#else
47#include <dn_test.h>
48#endif
49
50#define DN_SCHED_RR 3 // XXX Where?
51
52struct rr_queue {
53 struct dn_queue q; /* Standard queue */

--- 254 unchanged lines hidden ---
46#else
47#include <dn_test.h>
48#endif
49
50#define DN_SCHED_RR 3 // XXX Where?
51
52struct rr_queue {
53 struct dn_queue q; /* Standard queue */

--- 254 unchanged lines hidden ---