From 1feb75f340c2e8021d609a113b915d53b3b61922 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Fri, 28 Apr 2006 12:11:36 -0700
Subject: [PATCH] --- yaml --- r: 26368 b: refs/heads/master c:
 89bbb0a361cdae50eec863f10a876b58abf7d312 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/net/sched/sch_netem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8153067d26b0..d03f08530c43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43dff98b022ded593e73c3784bac03bc9fc7ec55
+refs/heads/master: 89bbb0a361cdae50eec863f10a876b58abf7d312
diff --git a/trunk/net/sched/sch_netem.c b/trunk/net/sched/sch_netem.c
index 7228d30512c7..5a4a4d0ae502 100644
--- a/trunk/net/sched/sch_netem.c
+++ b/trunk/net/sched/sch_netem.c
@@ -167,7 +167,7 @@ static int netem_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 	if (count == 0) {
 		sch->qstats.drops++;
 		kfree_skb(skb);
-		return NET_XMIT_DROP;
+		return NET_XMIT_BYPASS;
 	}
 
 	/*