diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /net/sched | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'net/sched')
| -rw-r--r-- | net/sched/Config.in | 4 | ||||
| -rw-r--r-- | net/sched/cls_tcindex.c | 1 | ||||
| -rw-r--r-- | net/sched/sch_ingress.c | 19 |
3 files changed, 16 insertions, 8 deletions
diff --git a/net/sched/Config.in b/net/sched/Config.in index f1d9059f4..bde82c341 100644 --- a/net/sched/Config.in +++ b/net/sched/Config.in @@ -17,7 +17,9 @@ tristate ' TEQL queue' CONFIG_NET_SCH_TEQL tristate ' TBF queue' CONFIG_NET_SCH_TBF tristate ' GRED queue' CONFIG_NET_SCH_GRED tristate ' Diffserv field marker' CONFIG_NET_SCH_DSMARK -tristate ' Ingress Qdisc' CONFIG_NET_SCH_INGRESS +if [ "$CONFIG_NETFILTER" = "y" ]; then + tristate ' Ingress Qdisc' CONFIG_NET_SCH_INGRESS +fi bool ' QoS support' CONFIG_NET_QOS if [ "$CONFIG_NET_QOS" = "y" ]; then bool ' Rate estimator' CONFIG_NET_ESTIMATOR diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c index 5aa6133cd..6aac88a17 100644 --- a/net/sched/cls_tcindex.c +++ b/net/sched/cls_tcindex.c @@ -4,6 +4,7 @@ * Written 1998,1999 by Werner Almesberger, EPFL ICA */ +#include <linux/config.h> #include <linux/module.h> #include <linux/types.h> #include <linux/kernel.h> diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index 852f56b22..64a915d7e 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c @@ -25,9 +25,9 @@ #include <linux/list.h> +#undef DEBUG_INGRESS - -#if 0 /* control */ +#ifdef DEBUG_INGRESS /* control */ #define DPRINTK(format,args...) printk(KERN_DEBUG format,##args) #else #define DPRINTK(format,args...) @@ -56,7 +56,9 @@ struct ingress_qdisc_data { static int ingress_graft(struct Qdisc *sch,unsigned long arg, struct Qdisc *new,struct Qdisc **old) { +#ifdef DEBUG_INGRESS struct ingress_qdisc_data *p = PRIV(sch); +#endif DPRINTK("ingress_graft(sch %p,[qdisc %p],new %p,old %p)\n", sch, p, new, old); @@ -73,8 +75,9 @@ static struct Qdisc *ingress_leaf(struct Qdisc *sch, unsigned long arg) static unsigned long ingress_get(struct Qdisc *sch,u32 classid) { +#ifdef DEBUG_INGRESS struct ingress_qdisc_data *p = PRIV(sch); - +#endif DPRINTK("ingress_get(sch %p,[qdisc %p],classid %x)\n", sch, p, classid); return TC_H_MIN(classid) + 1; } @@ -95,8 +98,9 @@ static void ingress_put(struct Qdisc *sch, unsigned long cl) static int ingress_change(struct Qdisc *sch, u32 classid, u32 parent, struct rtattr **tca, unsigned long *arg) { +#ifdef DEBUG_INGRESS struct ingress_qdisc_data *p = PRIV(sch); - +#endif DPRINTK("ingress_change(sch %p,[qdisc %p],classid %x,parent %x)," "arg 0x%lx\n", sch, p, classid, parent, *arg); DPRINTK("No effect. sch_ingress doesnt maintain classes at the moment"); @@ -107,8 +111,9 @@ static int ingress_change(struct Qdisc *sch, u32 classid, u32 parent, static void ingress_walk(struct Qdisc *sch,struct qdisc_walker *walker) { +#ifdef DEBUG_INGRESS struct ingress_qdisc_data *p = PRIV(sch); - +#endif DPRINTK("ingress_walk(sch %p,[qdisc %p],walker %p)\n", sch, p, walker); DPRINTK("No effect. sch_ingress doesnt maintain classes at the moment"); } @@ -180,8 +185,9 @@ static int ingress_requeue(struct sk_buff *skb,struct Qdisc *sch) static int ingress_drop(struct Qdisc *sch) { +#ifdef DEBUG_INGRESS struct ingress_qdisc_data *p = PRIV(sch); - +#endif DPRINTK("ingress_drop(sch %p,[qdisc %p])\n", sch, p); return 0; } @@ -218,7 +224,6 @@ used on the egress (might slow things for an iota) return fwres; } - /* after iptables */ static struct nf_hook_ops ing_ops = { |