aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_ingress.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-21 00:14:05 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:08:22 -0800
commit891687649a5c44a1d53668b4f7728bf97c8db8d5 (patch)
tree72d3fd72888e0243bfe86b916eade4db3a3173f6 /net/sched/sch_ingress.c
parent[NET_SCHED]: sch_ingress: avoid a few #ifdefs (diff)
downloadlinux-dev-891687649a5c44a1d53668b4f7728bf97c8db8d5.tar.xz
linux-dev-891687649a5c44a1d53668b4f7728bf97c8db8d5.zip
[NET_SCHED]: sch_ingress: remove useless printk
The printk about ingress qdisc registration error can't be triggered under normal circumstances. Since register_qdisc only fails for two identical registrations, the only way to trigger it is by loading the sch_ingress modules multiple times under different names, in which case we already return -EEXIST to userspace. 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/sched/sch_ingress.c')
-rw-r--r--net/sched/sch_ingress.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c
index 4c7f7e712918..72525710b66f 100644
--- a/net/sched/sch_ingress.c
+++ b/net/sched/sch_ingress.c
@@ -221,14 +221,7 @@ static struct Qdisc_ops ingress_qdisc_ops __read_mostly = {
static int __init ingress_module_init(void)
{
- int ret = 0;
-
- if ((ret = register_qdisc(&ingress_qdisc_ops)) < 0) {
- printk("Unable to register Ingress qdisc\n");
- return ret;
- }
-
- return ret;
+ return register_qdisc(&ingress_qdisc_ops);
}
static void __exit ingress_module_exit(void)