From: Patrick McHardy <kaber@trash.net>
Date: Mon, 21 Jan 2008 08:12:10 +0000 (-0800)
Subject: [NET_SCHED]: sch_ingress: remove unused inner qdisc
X-Git-Tag: v2.6.25-rc1~1162^2~256
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c21d4d5dd27329c30c5129d5dbc4942456af361c;p=linux-2.6

[NET_SCHED]: sch_ingress: remove unused inner qdisc

Signed-off-by: Patrick McHardy <kaber@trash.net>
Acked-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index cb8ba8b1ad..d803cd1376 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -27,7 +27,6 @@ static int nf_registered;
 #endif
 
 struct ingress_qdisc_data {
-	struct Qdisc		*q;
 	struct tcf_proto	*filter_list;
 };
 
@@ -178,8 +177,6 @@ static struct nf_hook_ops ing_ops[] __read_mostly = {
 
 static int ingress_init(struct Qdisc *sch, struct rtattr *opt)
 {
-	struct ingress_qdisc_data *p = qdisc_priv(sch);
-
 	/* Make sure either netfilter or preferably CLS_ACT is
 	 * compiled in */
 #ifndef CONFIG_NET_CLS_ACT
@@ -202,7 +199,6 @@ static int ingress_init(struct Qdisc *sch, struct rtattr *opt)
 	}
 #endif
 #endif
-	p->q = &noop_qdisc;
 	return 0;
 }