diff --git a/[refs] b/[refs] index 83964a46256d..5f4ad1e47791 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb53c048912976d1d81b8f3475463788f462eebd +refs/heads/master: c21d4d5dd27329c30c5129d5dbc4942456af361c diff --git a/trunk/net/sched/sch_ingress.c b/trunk/net/sched/sch_ingress.c index cb8ba8b1ad39..d803cd137629 100644 --- a/trunk/net/sched/sch_ingress.c +++ b/trunk/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; }