- no longer interferes with the original sfq.

Changed files:
    linux-libc-headers-esfq.patch -> 1.4

diff --git a/linux-libc-headers-esfq.patch b/linux-libc-headers-esfq.patch
index 0a07d545947e2542539ac8c706f1b2824629e9bc..a26d68f514036520003b750f9f0f4b417bf6f794 100644 (file)
--- a/linux-libc-headers-esfq.patch
+++ b/linux-libc-headers-esfq.patch
@@ -1,10 +1,16 @@
 diff -uNr linux-libc-headers-2.6.5.1.orig/include/linux/pkt_sched.h linux-libc-headers-2.6.5.1/include/linux/pkt_sched.h
 --- linux-libc-headers-2.6.5.1.orig/include/linux/pkt_sched.h  2004-05-02 23:08:48.000000000 +0200
 +++ linux-libc-headers-2.6.5.1/include/linux/pkt_sched.h       2004-05-07 23:42:56.411761880 +0200
-@@ -157,6 +157,13 @@
- 
- /* SFQ section */
+@@ -145,8 +145,29 @@
+  *
+  *    The only reason for this is efficiency, it is possible
+  *    to change these parameters in compile time.
++ *    
++ *    If you need to play with this values use esfq.
+  */
  
++/* ESFQ section */
++
 +enum
 +{
 +      TCA_SFQ_HASH_CLASSIC,
@@ -12,23 +18,16 @@ diff -uNr linux-libc-headers-2.6.5.1.orig/include/linux/pkt_sched.h linux-libc-h
 +      TCA_SFQ_HASH_SRC,
 +};
 +
- struct tc_sfq_qopt
- {
-       unsigned        quantum;        /* Bytes per round allocated to flow */
-@@ -164,6 +171,7 @@
-       __u32           limit;          /* Maximal packets in queue */
-       unsigned        divisor;        /* Hash divisor  */
-       unsigned        flows;          /* Maximal number of flows  */
++struct tc_esfq_qopt
++{
++      unsigned        quantum;        /* Bytes per round allocated to flow */
++      int             perturb_period; /* Period of hash perturbation */
++      __u32           limit;          /* Maximal packets in queue */
++      unsigned        divisor;        /* Hash divisor  */
++      unsigned        flows;          /* Maximal number of flows  */
 +      unsigned        hash_kind;      /* Hash function to use for flow identification */
- };
- 
- /*
-@@ -173,6 +181,8 @@
-  *
-  *    The only reason for this is efficiency, it is possible
-  *    to change these parameters in compile time.
-+ *    
-+ *    If you need to play with this values use esfq.
-  */
- 
++};
++
  /* RED section */
+ 
+ enum