mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-16 09:56:46 +00:00
netem: update version and cleanup
Get rid of debug message that are not useful, and enable the log messages in case of error. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
661b79725f
commit
250a65f782
@ -24,7 +24,7 @@
|
|||||||
#include <net/netlink.h>
|
#include <net/netlink.h>
|
||||||
#include <net/pkt_sched.h>
|
#include <net/pkt_sched.h>
|
||||||
|
|
||||||
#define VERSION "1.2"
|
#define VERSION "1.3"
|
||||||
|
|
||||||
/* Network Emulation Queuing algorithm.
|
/* Network Emulation Queuing algorithm.
|
||||||
====================================
|
====================================
|
||||||
@ -311,8 +311,6 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
|
|||||||
int ret;
|
int ret;
|
||||||
int count = 1;
|
int count = 1;
|
||||||
|
|
||||||
pr_debug("netem_enqueue skb=%p\n", skb);
|
|
||||||
|
|
||||||
/* Random duplication */
|
/* Random duplication */
|
||||||
if (q->duplicate && q->duplicate >= get_crandom(&q->dup_cor))
|
if (q->duplicate && q->duplicate >= get_crandom(&q->dup_cor))
|
||||||
++count;
|
++count;
|
||||||
@ -633,7 +631,7 @@ static int netem_change(struct Qdisc *sch, struct nlattr *opt)
|
|||||||
|
|
||||||
ret = fifo_set_limit(q->qdisc, qopt->limit);
|
ret = fifo_set_limit(q->qdisc, qopt->limit);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
pr_debug("netem: can't set fifo limit\n");
|
pr_info("netem: can't set fifo limit\n");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -769,13 +767,13 @@ static int netem_init(struct Qdisc *sch, struct nlattr *opt)
|
|||||||
q->qdisc = qdisc_create_dflt(sch->dev_queue, &tfifo_qdisc_ops,
|
q->qdisc = qdisc_create_dflt(sch->dev_queue, &tfifo_qdisc_ops,
|
||||||
TC_H_MAKE(sch->handle, 1));
|
TC_H_MAKE(sch->handle, 1));
|
||||||
if (!q->qdisc) {
|
if (!q->qdisc) {
|
||||||
pr_debug("netem: qdisc create failed\n");
|
pr_notice("netem: qdisc create tfifo qdisc failed\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = netem_change(sch, opt);
|
ret = netem_change(sch, opt);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
pr_debug("netem: change failed\n");
|
pr_info("netem: change failed\n");
|
||||||
qdisc_destroy(q->qdisc);
|
qdisc_destroy(q->qdisc);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user