some more kernel config cleanup.. last for today :)

[openwrt.git] / target / linux / generic-2.4 / patches / 212-htb_time_fix.patch

diff --git a/target/linux/generic-2.4/patches/212-htb_time_fix.patch b/target/linux/generic-2.4/patches/212-htb_time_fix.patch
index 7281093..faef690 100644 (file)
--- a/target/linux/generic-2.4/patches/212-htb_time_fix.patch
+++ b/target/linux/generic-2.4/patches/212-htb_time_fix.patch
@@ -1,6 +1,8 @@
---- linux.old/net/sched/sch_htb.c      2005-11-15 14:09:41.548066000 +0100
-+++ linux.dev/net/sched/sch_htb.c      2005-11-15 14:08:34.000000000 +0100
-@@ -369,7 +369,7 @@
+Index: linux-2.4.35.4/net/sched/sch_htb.c
+===================================================================
+--- linux-2.4.35.4.orig/net/sched/sch_htb.c
++++ linux-2.4.35.4/net/sched/sch_htb.c
+@@ -369,7 +369,7 @@ static void htb_debug_dump (struct htb_s

                struct list_head *l;
                list_for_each (l,q->hash+i) {
                        struct htb_class *cl = list_entry(l,struct htb_class,hlist);
                struct list_head *l;
                list_for_each (l,q->hash+i) {
                        struct htb_class *cl = list_entry(l,struct htb_class,hlist);


@@ -9,7 +11,7 @@
                        printk(KERN_DEBUG "htb*c%x m=%d t=%ld c=%ld pq=%lu df=%ld ql=%d "
                                        "pa=%x f:",
                                cl->classid,cl->cmode,cl->tokens,cl->ctokens,
                        printk(KERN_DEBUG "htb*c%x m=%d t=%ld c=%ld pq=%lu df=%ld ql=%d "
                                        "pa=%x f:",
                                cl->classid,cl->cmode,cl->tokens,cl->ctokens,

-@@ -617,7 +617,7 @@
+@@ -617,7 +617,7 @@ static void htb_deactivate_prios(struct 

   * mode transitions per time unit. The speed gain is about 1/6.
   */
  static __inline__ enum htb_cmode 
   * mode transitions per time unit. The speed gain is about 1/6.
   */
  static __inline__ enum htb_cmode 


@@ -18,7 +20,7 @@
  {
      long toks;
  
  {
      long toks;
  

-@@ -650,7 +650,7 @@
+@@ -650,7 +650,7 @@ htb_class_mode(struct htb_class *cl,long

   * to mode other than HTB_CAN_SEND (see htb_add_to_wait_tree).
   */
  static void 
   * to mode other than HTB_CAN_SEND (see htb_add_to_wait_tree).
   */
  static void 


@@ -27,7 +29,7 @@
  { 
        enum htb_cmode new_mode = htb_class_mode(cl,diff);
        
  { 
        enum htb_cmode new_mode = htb_class_mode(cl,diff);
        

-@@ -815,7 +815,8 @@
+@@ -815,7 +815,8 @@ static void htb_rate_timer(unsigned long

  static void htb_charge_class(struct htb_sched *q,struct htb_class *cl,
                int level,int bytes)
  {     
  static void htb_charge_class(struct htb_sched *q,struct htb_class *cl,
                int level,int bytes)
  {     


@@ -37,7 +39,7 @@
        enum htb_cmode old_mode;
        HTB_DBG(5,1,"htb_chrg_cl cl=%X lev=%d len=%d\n",cl->classid,level,bytes);
  
        enum htb_cmode old_mode;
        HTB_DBG(5,1,"htb_chrg_cl cl=%X lev=%d len=%d\n",cl->classid,level,bytes);
  

-@@ -831,7 +832,7 @@
+@@ -831,7 +832,7 @@ static void htb_charge_class(struct htb_

  #ifdef HTB_DEBUG
                if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) {
                        if (net_ratelimit())
  #ifdef HTB_DEBUG
                if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) {
                        if (net_ratelimit())


@@ -46,7 +48,7 @@
                                       cl->classid, diff,
                                       (unsigned long long) q->now,
                                       (unsigned long long) cl->t_c,
                                       cl->classid, diff,
                                       (unsigned long long) q->now,
                                       (unsigned long long) cl->t_c,

-@@ -848,7 +849,7 @@
+@@ -848,7 +849,7 @@ static void htb_charge_class(struct htb_

                }
                HTB_ACCNT (ctokens,cbuffer,ceil);
                cl->t_c = q->now;
                }
                HTB_ACCNT (ctokens,cbuffer,ceil);
                cl->t_c = q->now;


@@ -55,7 +57,7 @@
  
                old_mode = cl->cmode; diff = 0;
                htb_change_class_mode(q,cl,&diff);
  
                old_mode = cl->cmode; diff = 0;
                htb_change_class_mode(q,cl,&diff);

-@@ -887,7 +888,7 @@
+@@ -887,7 +888,7 @@ static long htb_do_events(struct htb_sch

                        level,q->wait_pq[level].rb_node,q->row_mask[level]);
        for (i = 0; i < 500; i++) {
                struct htb_class *cl;
                        level,q->wait_pq[level].rb_node,q->row_mask[level]);
        for (i = 0; i < 500; i++) {
                struct htb_class *cl;


@@ -64,7 +66,7 @@
                rb_node_t *p = q->wait_pq[level].rb_node;
                if (!p) return 0;
                while (p->rb_left) p = p->rb_left;
                rb_node_t *p = q->wait_pq[level].rb_node;
                if (!p) return 0;
                while (p->rb_left) p = p->rb_left;

-@@ -902,7 +903,7 @@
+@@ -902,7 +903,7 @@ static long htb_do_events(struct htb_sch

  #ifdef HTB_DEBUG
                if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) {
                        if (net_ratelimit())
  #ifdef HTB_DEBUG
                if (diff > cl->mbuffer || diff < 0 || PSCHED_TLESS(q->now, cl->t_c)) {
                        if (net_ratelimit())