summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-21 00:12:53 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:08:20 -0800
commitc6ee877f2e4c4d44c934528b4cec6c8d7f54d3ad (patch)
tree54c8e1ee3bb263cb9776deeb1ae1ce9b2c699d8e /net
parente037834758af82a24c4d390b93e1ce5e280a551a (diff)
downloadlinux-3.10-c6ee877f2e4c4d44c934528b4cec6c8d7f54d3ad.tar.gz
linux-3.10-c6ee877f2e4c4d44c934528b4cec6c8d7f54d3ad.tar.bz2
linux-3.10-c6ee877f2e4c4d44c934528b4cec6c8d7f54d3ad.zip
[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 <kaber@trash.net> Acked-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/sched/sch_ingress.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 1bbc648f06e..c69e7bc7fb6 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,