diff -urN linux-2.6.20.orig/include/linux/pkt_sched.h linux-2.6.20/include/linux/pkt_sched.h --- linux-2.6.20.orig/include/linux/pkt_sched.h 2007-02-04 19:44:54.000000000 +0100 +++ linux-2.6.20/include/linux/pkt_sched.h 2007-02-09 09:38:50.000000000 +0100 @@ -23,6 +23,11 @@ #define TC_PRIO_MAX 15 +#ifndef __KERNEL__ +#include +#endif +#include + /* Generic queue statistics, available for all the elements. Particular schedulers may have also their private records. */ @@ -466,4 +468,97 @@ #define NETEM_DIST_SCALE 8192 + +/* WRR section */ + +/* + * A sub weight and of a class + * All numbers are represented as parts of (2^64-1). + */ +struct tc_wrr_class_weight { + __u64 val; // Current value (0 is not valid) + __u64 decr; // Value pr bytes (2^64-1 is not valid) + __u64 incr; // Value pr seconds (2^64-1 is not valid) + __u64 min; // Minimal value (0 is not valid) + __u64 max; // Minimal value (0 is not valid) + time_t tim; // The time where the above information was correct +}; + +/* Packet send when modifying a class */ +struct tc_wrr_class_modf { + /* Not-valid values are ignored */ + struct tc_wrr_class_weight weight1; + struct tc_wrr_class_weight weight2; +}; + +/* Packet returned when quering a class */ +struct tc_wrr_class_stats { + char used; /* If this is false the information below is invalid */ + struct tc_wrr_class_modf class_modf; + unsigned char addr[ETH_ALEN]; + char usemac; /* True if addr is a MAC address, else it is an IP address + (this value is only for convience, it is always the same + value as in the qdisc) */ + int heappos; /* Current heap position or 0 if not in heap */ + __u64 penal_ls; /* Penalty value in heap (ls) */ + __u64 penal_ms; /* Penalty value in heap (ms) */ +}; + +/* Qdisc-wide penalty information (boolean values - 2 not valid) */ +struct tc_wrr_qdisc_weight { + signed char weight_mode; /* 0=No automatic change to weight + 1=Decrease normally + 2=Also multiply with number of machines + 3=Instead multiply with priority divided + with priority of the other. + -1=no change */ +}; + +/* Packet send when modifing a qdisc */ +struct tc_wrr_qdisc_modf { + /* Not-valid values are ignored */ + struct tc_wrr_qdisc_weight weight1; + struct tc_wrr_qdisc_weight weight2; +}; + +/* Packet send when creating a qdisc */ +struct tc_wrr_qdisc_crt { + struct tc_wrr_qdisc_modf qdisc_modf; + char srcaddr; /* 1=lookup source, 0=lookup destination */ + char usemac; /* 1=Classify on MAC addresses, 0=classify on IP */ + char usemasq; /* 1=Classify based on masqgrading - only valid + if usemac is zero */ + int bands_max; /* Maximal number of bands (i.e.: classes) */ + int proxy_maxconn; /* If differnt from 0 then we support proxy remapping + of packets. And this is the number of maximal + concurrent proxy connections. */ +}; + +/* Packet returned when quering a qdisc */ +struct tc_wrr_qdisc_stats { + struct tc_wrr_qdisc_crt qdisc_crt; + int proxy_curconn; + int nodes_in_heap; /* Current number of bands wanting to send something */ + int bands_cur; /* Current number of bands used (i.e.: MAC/IP addresses seen) */ + int bands_reused; /* Number of times this band has been reused. */ + int packets_requed; /* Number of times packets have been requeued. */ + __u64 priosum; /* Sum of priorities in heap where 1 is 2^32 */ +}; + +struct tc_wrr_qdisc_modf_std { + char proxy; /* This indicates which of the tc_wrr_qdisc_modf structers this is. 0=This struct */ + char change_class; /* Should we also change a class? */ + struct tc_wrr_qdisc_modf qdisc_modf; /* Only valid if change_class is false */ + unsigned char addr[ETH_ALEN]; /* Class to change (non-used bytes should be 0). Valid only of change_class is true */ + struct tc_wrr_class_modf class_modf; /* The change */ +}; + +/* Used for proxyremapping */ +struct tc_wrr_qdisc_modf_proxy { + char proxy; /* This indicates which of the tc_wrr_qdisc_modf structers this is. 1=This struct */ + char reset; /* This is 1 if the proxyremap information should be reset */ + int changec; /* changec is the number of elements in changes. */ + long changes[0]; /* This is an array of type ProxyRemapBlock */ +}; + #endif