iproute2-2.6.0-t7-test.patch

   1 diff -Nur iproute2.org/tc/q_esfq.c iproute2/tc/q_esfq.c
   2 --- iproute2.org/tc/q_esfq.c    2003-10-12 12:19:27.537543736 +0200
   3 +++ iproute2/tc/q_esfq.c        2003-10-12 12:07:04.928437480 +0200
   4 @@ -42,7 +42,7 @@
   5
   6         memset(&opt, 0, sizeof(opt));
   7
   8 -       opt.hash_kind= TCA_SFQ_HASH_CLASSIC;
   9 +//     opt.hash_kind= TCA_SFQ_HASH_CLASSIC;
  10
  11         while (argc > 0) {
  12                 if (strcmp(*argv, "quantum") == 0) {
  13 @@ -85,22 +85,22 @@
  14                                 return -1;
  15                         }
  16                         ok++;
  17 -               } else if (strcmp(*argv, "hash") == 0) {
  18 -                       NEXT_ARG();
  19 -                       if(strcmp(*argv,"classic") == 0) {
  20 -                               opt.hash_kind= TCA_SFQ_HASH_CLASSIC;
  21 -                       } else
  22 -                       if(strcmp(*argv,"dst") == 0) {
  23 -                               opt.hash_kind= TCA_SFQ_HASH_DST;
  24 -                       } else
  25 -                       if(strcmp(*argv,"src") == 0) {
  26 -                               opt.hash_kind= TCA_SFQ_HASH_SRC;
  27 -                       } else {
  28 -                               fprintf(stderr, "Illegal \"hash\"\n");
  29 -                               explain();
  30 -                               return -1;
  31 -                       }
  32 -                       ok++;
  33 +//             } else if (strcmp(*argv, "hash") == 0) {
  34 +//                     NEXT_ARG();
  35 +//                     if(strcmp(*argv,"classic") == 0) {
  36 +//                             opt.hash_kind= TCA_SFQ_HASH_CLASSIC;
  37 +//                     } else
  38 +//                     if(strcmp(*argv,"dst") == 0) {
  39 +//                             opt.hash_kind= TCA_SFQ_HASH_DST;
  40 +//                     } else
  41 +//                     if(strcmp(*argv,"src") == 0) {
  42 +//                             opt.hash_kind= TCA_SFQ_HASH_SRC;
  43 +//                     } else {
  44 +//                             fprintf(stderr, "Illegal \"hash\"\n");
  45 +//                             explain();
  46 +//                             return -1;
  47 +//                     }
  48 +//                     ok++;
  49                 } else if (strcmp(*argv, "help") == 0) {
  50                         explain();
  51                         return -1;
  52 @@ -136,22 +136,22 @@
  53         if (qopt->perturb_period)
  54                 fprintf(f, "perturb %dsec ", qopt->perturb_period);
  55
  56 -               fprintf(f,"hash: ");
  57 -       switch(qopt->hash_kind)
  58 -       {
  59 -       case TCA_SFQ_HASH_CLASSIC:
  60 -               fprintf(f,"classic");
  61 -               break;
  62 -       case TCA_SFQ_HASH_DST:
  63 -               fprintf(f,"dst");
  64 -               break;
  65 -       case TCA_SFQ_HASH_SRC:
  66 -               fprintf(f,"src");
  67 -               break;
  68 -       default:
  69 -               fprintf(f,"Unknown");
  70 -       }
  71 -       return 0;
  72 +//             fprintf(f,"hash: ");
  73 +//     switch(qopt->hash_kind)
  74 +//     {
  75 +//     case TCA_SFQ_HASH_CLASSIC:
  76 +//             fprintf(f,"classic");
  77 +//             break;
  78 +//     case TCA_SFQ_HASH_DST:
  79 +//             fprintf(f,"dst");
  80 +//             break;
  81 +//     case TCA_SFQ_HASH_SRC:
  82 +//             fprintf(f,"src");
  83 +//             break;
  84 +//     default:
  85 +//             fprintf(f,"Unknown");
  86 +//     }
  87 +//     return 0;
  88  }
  89
  90  static int esfq_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstats)
  91 diff -Nur iproute2.org/tc/q_htb.c iproute2/tc/q_htb.c
  92 --- iproute2.org/tc/q_htb.c     2003-10-12 12:19:27.462555136 +0200
  93 +++ iproute2/tc/q_htb.c 2003-10-12 12:16:53.721927264 +0200
  94 @@ -108,7 +108,8 @@
  95         struct tc_htb_glob opt;
  96         struct rtattr *tail;
  97         unsigned i; char *p;
  98 -       opt.rate2quantum = 10; opt.defcls = 1; opt.use_dcache = 0;
  99 +       opt.rate2quantum = 10; opt.defcls = 1;
 100 +//     opt.use_dcache = 0;
 101         opt.debug = 0;
 102
 103         while (argc > 0) {
 104 @@ -128,8 +129,8 @@
 105                         if (*p<'0' || *p>'3') break;
 106                         opt.debug |= (*p-'0')<<(2*i);
 107                     }
 108 -               } else if (matches(*argv, "dcache") == 0) {
 109 -                   opt.use_dcache = 1;
 110 +//             } else if (matches(*argv, "dcache") == 0) {
 111 +//                 opt.use_dcache = 1;
 112                 } else {
 113                         fprintf(stderr, "What is \"%s\"?\n", *argv);
 114                         explain();
 115 @@ -154,7 +155,7 @@
 116         struct rtattr *tail;
 117
 118         memset(&opt, 0, sizeof(opt)); mtu = 1600; /* eth packet len */
 119 -       opt.injectd = 100; /* disable injecting */
 120 +//     opt.injectd = 100; /* disable injecting */
 121
 122         while (argc > 0) {
 123                 if (matches(*argv, "prio") == 0) {
 124 @@ -168,11 +169,11 @@
 125                         if (get_u32(&mtu, *argv, 10)) {
 126                                 explain1("mtu"); return -1;
 127                         }
 128 -               } else if (matches(*argv, "inject") == 0) {
 129 -                       NEXT_ARG();
 130 -                       if (get_u8(&opt.injectd, *argv, 10)) {
 131 -                               explain1("inject"); return -1;
 132 -                       }
 133 +//             } else if (matches(*argv, "inject") == 0) {
 134 +//                     NEXT_ARG();
 135 +//                     if (get_u8(&opt.injectd, *argv, 10)) {
 136 +//                             explain1("inject"); return -1;
 137 +//                     }
 138                 } else if (matches(*argv, "burst") == 0 ||
 139                         strcmp(*argv, "buffer") == 0 ||
 140                         strcmp(*argv, "maxburst") == 0) {
 141 @@ -306,10 +307,10 @@
 142             gopt = RTA_DATA(tb[TCA_HTB_INIT]);
 143             if (RTA_PAYLOAD(tb[TCA_HTB_INIT])  < sizeof(*gopt)) return -1;
 144
 145 -           fprintf(f, "r2q %d default %x dcache %d\n"
 146 -                          " deq_util 1/%d deq_rate %d trials_per_deq %d\n dcache_hits %u direct_packets %u",
 147 -                   gopt->rate2quantum,gopt->defcls,gopt->use_dcache,1000000/(1+gopt->utilz),
 148 -                   gopt->deq_rate, gopt->trials/(1+gopt->deq_rate),gopt->dcache_hits,gopt->direct_pkts);
 149 +//         fprintf(f, "r2q %d default %x dcache %d\n"
 150 +//                        " deq_util 1/%d deq_rate %d trials_per_deq %d\n dcache_hits %u direct_packets %u",
 151 +//                 gopt->rate2quantum,gopt->defcls,gopt->use_dcache,1000000/(1+gopt->utilz),
 152 +//                 gopt->deq_rate, gopt->trials/(1+gopt->deq_rate),gopt->dcache_hits,gopt->direct_pkts);
 153         }
 154         return 0;
 155  }
 156 @@ -324,8 +325,8 @@
 157                 return -1;
 158
 159         st = RTA_DATA(xstats);
 160 -       fprintf(f, " lended: %u borrowed: %u giants: %u injects: %u\n",
 161 -               st->lends,st->borrows,st->giants,st->injects);
 162 +       fprintf(f, " lended: %u borrowed: %u giants: %u\n",
 163 +               st->lends,st->borrows,st->giants);
 164         fprintf(f, " tokens: %d ctokens: %d\n", st->tokens,st->ctokens);
 165         return 0;
 166  }