From: Patrick McHardy Date: Mon, 21 Jan 2008 08:12:53 +0000 (-0800) Subject: [NET_SCHED]: sch_ingress: remove unnecessary ops X-Git-Tag: v2.6.25-rc1~1162^2~254 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6ee877f2e4c4d44c934528b4cec6c8d7f54d3ad;p=linux-2.6 [NET_SCHED]: sch_ingress: remove unnecessary ops - ->reset is optional - sch_api provides identical defaults for ->dequeue/->requeue - ->drop can't happen since ingress never has a parent qdisc Signed-off-by: Patrick McHardy Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller --- diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index 1bbc648f06..c69e7bc7fb 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c @@ -118,21 +118,6 @@ static int ingress_enqueue(struct sk_buff *skb, struct Qdisc *sch) return result; } -static struct sk_buff *ingress_dequeue(struct Qdisc *sch) -{ - return NULL; -} - -static int ingress_requeue(struct sk_buff *skb, struct Qdisc *sch) -{ - return 0; -} - -static unsigned int ingress_drop(struct Qdisc *sch) -{ - return 0; -} - #ifndef CONFIG_NET_CLS_ACT #ifdef CONFIG_NETFILTER static unsigned int ing_hook(unsigned int hook, struct sk_buff *skb, @@ -202,11 +187,6 @@ static int ingress_init(struct Qdisc *sch, struct rtattr *opt) return 0; } -static void ingress_reset(struct Qdisc *sch) -{ - return; -} - /* ------------------------------------------------------------- */ static void ingress_destroy(struct Qdisc *sch) @@ -248,11 +228,7 @@ static struct Qdisc_ops ingress_qdisc_ops __read_mostly = { .id = "ingress", .priv_size = sizeof(struct ingress_qdisc_data), .enqueue = ingress_enqueue, - .dequeue = ingress_dequeue, - .requeue = ingress_requeue, - .drop = ingress_drop, .init = ingress_init, - .reset = ingress_reset, .destroy = ingress_destroy, .dump = ingress_dump, .owner = THIS_MODULE,