Skip to content

Commit

Permalink
[NET_SCHED]: sch_ingress: remove unnecessary ops
Browse files Browse the repository at this point in the history
- ->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>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Jan 28, 2008
1 parent e037834 commit c6ee877
Showing 1 changed file with 0 additions and 24 deletions.
24 changes: 0 additions & 24 deletions net/sched/sch_ingress.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit c6ee877

Please sign in to comment.