htb_0.8.5_esfq.diff 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. --- htb.init.old 2004-01-29 22:41:23.000000000 +0100
  2. +++ htb.init 2006-09-07 23:32:58.000000000 +0200
  3. @@ -226,7 +226,7 @@
  4. # priority. Also, classes with higher priority are offered excess
  5. # bandwidth first.
  6. #
  7. -# LEAF=none|sfq|pfifo|bfifo optional, default "none"
  8. +# LEAF=none|sfq|esfq|pfifo|bfifo optional, default "none"
  9. #
  10. # Tells the script to attach specified leaf queueing discipline to HTB
  11. # class. By default, no leaf qdisc is used.
  12. @@ -261,6 +261,15 @@
  13. # will never take place which is what you probably don't want. The
  14. # default value of 10 seconds is probably a good value.
  15. #
  16. +### ESFQ qdisc parameters
  17. +#
  18. +# Same as SFQ and ...
  19. +#
  20. +# HASH=classic|src|dst
  21. +#
  22. +# src mean is fair per source IP
  23. +# dsr mean is fair per destination IP
  24. +#
  25. ### PFIFO/BFIFO qdisc parameters
  26. #
  27. # Those are simple FIFO queueing disciplines. They only have one parameter
  28. @@ -427,14 +445,14 @@
  29. ### Modules to probe for. Uncomment the last HTB_PROBE
  30. ### line if you have QoS support compiled into kernel
  31. -HTB_PROBE="sch_htb sch_sfq cls_fw cls_u32 cls_route"
  32. +HTB_PROBE="sch_htb sch_sfq sch_esfq cls_fw cls_u32 cls_route"
  33. #HTB_PROBE=""
  34. ### Config keywords
  35. HTB_QDISC="DEFAULT\|DCACHE\|R2Q"
  36. HTB_CLASS="RATE\|CEIL\|BURST\|CBURST\|PRIO\|LEAF\|MTU"
  37. HTB_CLASS="$HTB_CLASS\|PRIO_RULE\|PRIO_MARK\|PRIO_REALM"
  38. -HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB"
  39. +HTB_CLASS="$HTB_CLASS\|LIMIT\|QUANTUM\|PERTURB\|HASH"
  40. HTB_CLASS="$HTB_CLASS\|TOS"
  41. @@ -801,6 +819,8 @@
  42. LEAFPARM="${PERTURB:+perturb $PERTURB} ${QUANTUM:+quantum $QUANTUM}"
  43. elif [ "$LEAF" = "pfifo" -o "$LEAF" = "bfifo" ]; then
  44. LEAFPARM="${LIMIT:+limit $LIMIT}"
  45. + elif [ "$LEAF" = "esfq" ]; then
  46. + LEAFPARM="${PERTURB:+perturb $PERTURB} ${QUANTUM:+quantum $QUANTUM} ${HASH:+hash $HASH}"
  47. else
  48. htb_fail_off "unknown leaf qdisc ($LEAF) in $classfile!"
  49. fi