kernel-2.6.8.1-sch_ingress.patch

   1 --- linux-2.6.8.1/net/sched/sch_ingress.c       2004-08-14 12:56:26.000000000 +0200
   2 +++ linux-2.6.9-rc2/net/sched/sch_ingress.c     2004-09-13 07:33:55.000000000 +0200
   3 @@ -283,21 +283,18 @@
   4  #ifndef CONFIG_NET_CLS_ACT
   5  #ifndef CONFIG_NETFILTER
   6         printk("You MUST compile classifier actions into the kernel\n");
   7 -       goto error;
   8 +       return -EINVAL;
   9  #else
  10         printk("Ingress scheduler: Classifier actions prefered over netfilter\n");
  11  #endif
  12  #endif
  13
  14 -       if (NULL == p)
  15 -               goto error;
  16 -
  17  #ifndef CONFIG_NET_CLS_ACT
  18  #ifdef CONFIG_NETFILTER
  19         if (!nf_registered) {
  20                 if (nf_register_hook(&ing_ops) < 0) {
  21                         printk("ingress qdisc registration error \n");
  22 -                       goto error;
  23 +                       return -EINVAL;
  24                 }
  25                 nf_registered++;
  26         }
  27 @@ -305,12 +302,8 @@
  28  #endif
  29
  30         DPRINTK("ingress_init(sch %p,[qdisc %p],opt %p)\n",sch,p,opt);
  31 -       memset(p, 0, sizeof(*p));
  32 -       p->filter_list = NULL;
  33         p->q = &noop_qdisc;
  34         return 0;
  35 -error:
  36 -       return -EINVAL;
  37  }
  38
  39
  40 @@ -346,9 +339,6 @@
  41                 p->filter_list = tp->next;
  42                 tcf_destroy(tp);
  43         }
  44 -       memset(p, 0, sizeof(*p));
  45 -       p->filter_list = NULL;
  46 -
  47  #if 0
  48  /* for future use */
  49         qdisc_destroy(p->q);