Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6ee877f authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[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: default avatarPatrick McHardy <kaber@trash.net>
Acked-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0378347

net/sched/sch_ingress.c

+0 −24
Original line number Diff line number Diff line
@@ -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,