From patchwork Wed Feb 23 23:04:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 84264 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 21DC9B7263 for ; Thu, 24 Feb 2011 10:08:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754950Ab1BWXHw (ORCPT ); Wed, 23 Feb 2011 18:07:52 -0500 Received: from suva.vyatta.com ([76.74.103.44]:47479 "EHLO suva.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754278Ab1BWXHv (ORCPT ); Wed, 23 Feb 2011 18:07:51 -0500 Received: from suva.vyatta.com (suva [127.0.0.1]) by suva.vyatta.com (8.13.7/8.13.7) with ESMTP id p1NN7bBM003735; Wed, 23 Feb 2011 15:07:37 -0800 Received: (from shemminger@localhost) by suva.vyatta.com (8.13.7/8.13.7/Submit) id p1NN7baH003734; Wed, 23 Feb 2011 15:07:37 -0800 Message-Id: <20110223230534.552847315@vyatta.com> User-Agent: quilt/0.48-1 Date: Wed, 23 Feb 2011 15:04:22 -0800 From: Stephen Hemminger To: "David S. Miller" Cc: netdev@vger.kernel.org Subject: [PATCH net-next 6/6] netem: update version and cleanup References: <20110223230416.532009518@vyatta.com> Content-Disposition: inline; filename=netem-update.patch Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Get rid of debug message that are not useful, and enable the log messages in case of error. Signed-off-by: Stephen Hemminger --- net/sched/sch_netem.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/sched/sch_netem.c 2011-02-23 15:01:29.159338952 -0800 +++ b/net/sched/sch_netem.c 2011-02-23 15:02:00.451849096 -0800 @@ -24,7 +24,7 @@ #include #include -#define VERSION "1.2" +#define VERSION "1.3" /* Network Emulation Queuing algorithm. ==================================== @@ -311,8 +311,6 @@ static int netem_enqueue(struct sk_buff int ret; int count = 1; - pr_debug("netem_enqueue skb=%p\n", skb); - /* Random duplication */ if (q->duplicate && q->duplicate >= get_crandom(&q->dup_cor)) ++count; @@ -633,7 +631,7 @@ static int netem_change(struct Qdisc *sc ret = fifo_set_limit(q->qdisc, qopt->limit); if (ret) { - pr_debug("netem: can't set fifo limit\n"); + pr_info("netem: can't set fifo limit\n"); return ret; } @@ -769,13 +767,13 @@ static int netem_init(struct Qdisc *sch, q->qdisc = qdisc_create_dflt(sch->dev_queue, &tfifo_qdisc_ops, TC_H_MAKE(sch->handle, 1)); if (!q->qdisc) { - pr_debug("netem: qdisc create failed\n"); + pr_notice("netem: qdisc create tfifo qdisc failed\n"); return -ENOMEM; } ret = netem_change(sch, opt); if (ret) { - pr_debug("netem: change failed\n"); + pr_info("netem: change failed\n"); qdisc_destroy(q->qdisc); } return ret;